From 4b05623ff75c628fce7b244716237d2fc9a38036 Mon Sep 17 00:00:00 2001
From: Max <max.kerpel@quintel.com>
Date: Tue, 28 Oct 2025 14:47:35 +0100
Subject: [PATCH 1/7] 'bug fix biomass potential'

---
 .../GM0014_groningen.derived.ad               |   4 +-
 datasets/GM0014_groningen/graph_values.yml    |   6 +-
 .../GM0034_almere/GM0034_almere.derived.ad    |   4 +-
 datasets/GM0034_almere/graph_values.yml       |   6 +-
 .../GM0037_stadskanaal.derived.ad             |   4 +-
 datasets/GM0037_stadskanaal/graph_values.yml  |   6 +-
 .../GM0047_veendam/GM0047_veendam.derived.ad  |   4 +-
 datasets/GM0047_veendam/graph_values.yml      |   6 +-
 .../GM0050_zeewolde.derived.ad                |   4 +-
 datasets/GM0050_zeewolde/graph_values.yml     |   6 +-
 .../GM0059_achtkarspelen.derived.ad           |   4 +-
 .../GM0059_achtkarspelen/graph_values.yml     |   6 +-
 .../GM0060_ameland/GM0060_ameland.derived.ad  |   4 +-
 datasets/GM0060_ameland/graph_values.yml      |   6 +-
 .../GM0072_harlingen.derived.ad               |   4 +-
 datasets/GM0072_harlingen/graph_values.yml    |   6 +-
 .../GM0074_heerenveen.derived.ad              |   4 +-
 datasets/GM0074_heerenveen/graph_values.yml   |   6 +-
 .../GM0080_leeuwarden.derived.ad              |   4 +-
 datasets/GM0080_leeuwarden/graph_values.yml   |   6 +-
 .../GM0085_ooststellingwerf.derived.ad        |   4 +-
 .../GM0085_ooststellingwerf/graph_values.yml  |   6 +-
 .../GM0086_opsterland.derived.ad              |   4 +-
 datasets/GM0086_opsterland/graph_values.yml   |   6 +-
 .../GM0088_schiermonnikoog.derived.ad         |   4 +-
 .../GM0088_schiermonnikoog/graph_values.yml   |   6 +-
 .../GM0090_smallingerland.derived.ad          |   4 +-
 .../GM0090_smallingerland/graph_values.yml    |   6 +-
 .../GM0093_terschelling.derived.ad            |   4 +-
 datasets/GM0093_terschelling/graph_values.yml |   6 +-
 .../GM0096_vlieland.derived.ad                |   4 +-
 datasets/GM0096_vlieland/graph_values.yml     |   6 +-
 .../GM0098_weststellingwerf.derived.ad        |   4 +-
 .../GM0098_weststellingwerf/graph_values.yml  |   6 +-
 datasets/GM0106_assen/GM0106_assen.derived.ad |   4 +-
 datasets/GM0106_assen/graph_values.yml        |   6 +-
 .../GM0109_coevorden.derived.ad               |   4 +-
 datasets/GM0109_coevorden/graph_values.yml    |   6 +-
 datasets/GM0114_emmen/GM0114_emmen.derived.ad |   4 +-
 datasets/GM0114_emmen/graph_values.yml        |   6 +-
 .../GM0118_hoogeveen.derived.ad               |   4 +-
 datasets/GM0118_hoogeveen/graph_values.yml    |   6 +-
 .../GM0119_meppel/GM0119_meppel.derived.ad    |   4 +-
 datasets/GM0119_meppel/graph_values.yml       |   6 +-
 .../GM0141_almelo/GM0141_almelo.derived.ad    |   4 +-
 datasets/GM0141_almelo/graph_values.yml       |   6 +-
 datasets/GM0147_borne/GM0147_borne.derived.ad |   4 +-
 datasets/GM0147_borne/graph_values.yml        |   6 +-
 .../GM0148_dalfsen/GM0148_dalfsen.derived.ad  |   4 +-
 datasets/GM0148_dalfsen/graph_values.yml      |   6 +-
 .../GM0150_deventer.derived.ad                |   4 +-
 datasets/GM0150_deventer/graph_values.yml     |   6 +-
 .../GM0153_enschede.derived.ad                |   4 +-
 datasets/GM0153_enschede/graph_values.yml     |   6 +-
 .../GM0158_haaksbergen.derived.ad             |   4 +-
 datasets/GM0158_haaksbergen/graph_values.yml  |   6 +-
 .../GM0160_hardenberg.derived.ad              |   4 +-
 datasets/GM0160_hardenberg/graph_values.yml   |   6 +-
 .../GM0163_hellendoorn.derived.ad             |   4 +-
 datasets/GM0163_hellendoorn/graph_values.yml  |   6 +-
 .../GM0164_hengelo/GM0164_hengelo.derived.ad  |   4 +-
 datasets/GM0164_hengelo/graph_values.yml      |   6 +-
 .../GM0166_kampen/GM0166_kampen.derived.ad    |   4 +-
 datasets/GM0166_kampen/graph_values.yml       |   6 +-
 .../GM0168_losser/GM0168_losser.derived.ad    |   4 +-
 datasets/GM0168_losser/graph_values.yml       |   6 +-
 .../GM0171_noordoostpolder.derived.ad         |   4 +-
 .../GM0171_noordoostpolder/graph_values.yml   |   6 +-
 .../GM0173_oldenzaal.derived.ad               |   4 +-
 datasets/GM0173_oldenzaal/graph_values.yml    |   6 +-
 datasets/GM0175_ommen/GM0175_ommen.derived.ad |   4 +-
 datasets/GM0175_ommen/graph_values.yml        |   6 +-
 .../GM0177_raalte/GM0177_raalte.derived.ad    |   4 +-
 datasets/GM0177_raalte/graph_values.yml       |   6 +-
 .../GM0180_staphorst.derived.ad               |   4 +-
 datasets/GM0180_staphorst/graph_values.yml    |   6 +-
 .../GM0183_tubbergen.derived.ad               |   4 +-
 datasets/GM0183_tubbergen/graph_values.yml    |   6 +-
 datasets/GM0184_urk/GM0184_urk.derived.ad     |   4 +-
 datasets/GM0184_urk/graph_values.yml          |   6 +-
 .../GM0189_wierden/GM0189_wierden.derived.ad  |   4 +-
 datasets/GM0189_wierden/graph_values.yml      |   6 +-
 .../GM0193_zwolle/GM0193_zwolle.derived.ad    |   4 +-
 datasets/GM0193_zwolle/graph_values.yml       |   6 +-
 .../GM0197_aalten/GM0197_aalten.derived.ad    |   4 +-
 datasets/GM0197_aalten/graph_values.yml       |   6 +-
 .../GM0200_apeldoorn.derived.ad               |   4 +-
 datasets/GM0200_apeldoorn/graph_values.yml    |   6 +-
 .../GM0202_arnhem/GM0202_arnhem.derived.ad    |   4 +-
 datasets/GM0202_arnhem/graph_values.yml       |   6 +-
 .../GM0203_barneveld.derived.ad               |   4 +-
 datasets/GM0203_barneveld/graph_values.yml    |   6 +-
 .../GM0209_beuningen.derived.ad               |   4 +-
 datasets/GM0209_beuningen/graph_values.yml    |   6 +-
 .../GM0213_brummen/GM0213_brummen.derived.ad  |   4 +-
 datasets/GM0213_brummen/graph_values.yml      |   6 +-
 datasets/GM0214_buren/GM0214_buren.derived.ad |   4 +-
 datasets/GM0214_buren/graph_values.yml        |   6 +-
 .../GM0216_culemborg.derived.ad               |   4 +-
 datasets/GM0216_culemborg/graph_values.yml    |   6 +-
 .../GM0221_doesburg.derived.ad                |   4 +-
 datasets/GM0221_doesburg/graph_values.yml     |   6 +-
 .../GM0222_doetinchem.derived.ad              |   4 +-
 datasets/GM0222_doetinchem/graph_values.yml   |   6 +-
 .../GM0225_druten/GM0225_druten.derived.ad    |   4 +-
 datasets/GM0225_druten/graph_values.yml       |   6 +-
 .../GM0226_duiven/GM0226_duiven.derived.ad    |   4 +-
 datasets/GM0226_duiven/graph_values.yml       |   6 +-
 datasets/GM0228_ede/GM0228_ede.derived.ad     |   4 +-
 datasets/GM0228_ede/graph_values.yml          |   6 +-
 .../GM0230_elburg/GM0230_elburg.derived.ad    |   4 +-
 datasets/GM0230_elburg/graph_values.yml       |   6 +-
 datasets/GM0232_epe/GM0232_epe.derived.ad     |   4 +-
 datasets/GM0232_epe/graph_values.yml          |   6 +-
 .../GM0233_ermelo/GM0233_ermelo.derived.ad    |   4 +-
 datasets/GM0233_ermelo/graph_values.yml       |   6 +-
 .../GM0243_harderwijk.derived.ad              |   4 +-
 datasets/GM0243_harderwijk/graph_values.yml   |   6 +-
 .../GM0244_hattem/GM0244_hattem.derived.ad    |   4 +-
 datasets/GM0244_hattem/graph_values.yml       |   6 +-
 .../GM0246_heerde/GM0246_heerde.derived.ad    |   4 +-
 datasets/GM0246_heerde/graph_values.yml       |   6 +-
 .../GM0252_heumen/GM0252_heumen.derived.ad    |   4 +-
 datasets/GM0252_heumen/graph_values.yml       |   6 +-
 .../GM0262_lochem/GM0262_lochem.derived.ad    |   4 +-
 datasets/GM0262_lochem/graph_values.yml       |   6 +-
 .../GM0263_maasdriel.derived.ad               |   4 +-
 datasets/GM0263_maasdriel/graph_values.yml    |   6 +-
 .../GM0267_nijkerk/GM0267_nijkerk.derived.ad  |   4 +-
 datasets/GM0267_nijkerk/graph_values.yml      |   6 +-
 .../GM0268_nijmegen.derived.ad                |   4 +-
 datasets/GM0268_nijmegen/graph_values.yml     |   6 +-
 .../GM0269_oldebroek.derived.ad               |   4 +-
 datasets/GM0269_oldebroek/graph_values.yml    |   6 +-
 .../GM0273_putten/GM0273_putten.derived.ad    |   4 +-
 datasets/GM0273_putten/graph_values.yml       |   6 +-
 .../GM0274_renkum/GM0274_renkum.derived.ad    |   4 +-
 datasets/GM0274_renkum/graph_values.yml       |   6 +-
 .../GM0275_rheden/GM0275_rheden.derived.ad    |   4 +-
 datasets/GM0275_rheden/graph_values.yml       |   6 +-
 .../GM0277_rozendaal.derived.ad               |   4 +-
 datasets/GM0277_rozendaal/graph_values.yml    |   6 +-
 .../GM0279_scherpenzeel.derived.ad            |   4 +-
 datasets/GM0279_scherpenzeel/graph_values.yml |   6 +-
 datasets/GM0281_tiel/GM0281_tiel.derived.ad   |   4 +-
 datasets/GM0281_tiel/graph_values.yml         |   6 +-
 .../GM0285_voorst/GM0285_voorst.derived.ad    |   4 +-
 datasets/GM0285_voorst/graph_values.yml       |   6 +-
 .../GM0289_wageningen.derived.ad              |   4 +-
 datasets/GM0289_wageningen/graph_values.yml   |   6 +-
 .../GM0293_westervoort.derived.ad             |   4 +-
 datasets/GM0293_westervoort/graph_values.yml  |   6 +-
 .../GM0294_winterswijk.derived.ad             |   4 +-
 datasets/GM0294_winterswijk/graph_values.yml  |   6 +-
 .../GM0296_wijchen/GM0296_wijchen.derived.ad  |   4 +-
 datasets/GM0296_wijchen/graph_values.yml      |   6 +-
 .../GM0297_zaltbommel.derived.ad              |   4 +-
 datasets/GM0297_zaltbommel/graph_values.yml   |   6 +-
 .../GM0299_zevenaar.derived.ad                |   4 +-
 datasets/GM0299_zevenaar/graph_values.yml     |   6 +-
 .../GM0301_zutphen/GM0301_zutphen.derived.ad  |   4 +-
 datasets/GM0301_zutphen/graph_values.yml      |   6 +-
 .../GM0302_nunspeet.derived.ad                |   4 +-
 datasets/GM0302_nunspeet/graph_values.yml     |   6 +-
 .../GM0303_dronten/GM0303_dronten.derived.ad  |   4 +-
 datasets/GM0303_dronten/graph_values.yml      |   6 +-
 .../GM0307_amersfoort.derived.ad              |   4 +-
 datasets/GM0307_amersfoort/graph_values.yml   |   6 +-
 datasets/GM0308_baarn/GM0308_baarn.derived.ad |   4 +-
 datasets/GM0308_baarn/graph_values.yml        |   6 +-
 .../GM0310_de_bilt/GM0310_de_bilt.derived.ad  |   4 +-
 datasets/GM0310_de_bilt/graph_values.yml      |   6 +-
 .../GM0312_bunnik/GM0312_bunnik.derived.ad    |   4 +-
 datasets/GM0312_bunnik/graph_values.yml       |   6 +-
 .../GM0313_bunschoten.derived.ad              |   4 +-
 datasets/GM0313_bunschoten/graph_values.yml   |   6 +-
 .../GM0317_eemnes/GM0317_eemnes.derived.ad    |   4 +-
 datasets/GM0317_eemnes/graph_values.yml       |   6 +-
 .../GM0321_houten/GM0321_houten.derived.ad    |   4 +-
 datasets/GM0321_houten/graph_values.yml       |   6 +-
 .../GM0327_leusden/GM0327_leusden.derived.ad  |   4 +-
 datasets/GM0327_leusden/graph_values.yml      |   6 +-
 datasets/GM0331_lopik/GM0331_lopik.derived.ad |   4 +-
 datasets/GM0331_lopik/graph_values.yml        |   6 +-
 .../GM0335_montfoort.derived.ad               |   4 +-
 datasets/GM0335_montfoort/graph_values.yml    |   6 +-
 .../GM0339_renswoude.derived.ad               |   4 +-
 datasets/GM0339_renswoude/graph_values.yml    |   6 +-
 .../GM0340_rhenen/GM0340_rhenen.derived.ad    |   4 +-
 datasets/GM0340_rhenen/graph_values.yml       |   6 +-
 datasets/GM0342_soest/GM0342_soest.derived.ad |   4 +-
 datasets/GM0342_soest/graph_values.yml        |   6 +-
 .../GM0344_utrecht/GM0344_utrecht.derived.ad  |   4 +-
 datasets/GM0344_utrecht/graph_values.yml      |   6 +-
 .../GM0345_veenendaal.derived.ad              |   4 +-
 datasets/GM0345_veenendaal/graph_values.yml   |   6 +-
 .../GM0351_woudenberg.derived.ad              |   4 +-
 datasets/GM0351_woudenberg/graph_values.yml   |   6 +-
 .../GM0352_wijk_bij_duurstede.derived.ad      |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0353_ijsselstein.derived.ad             |   4 +-
 datasets/GM0353_ijsselstein/graph_values.yml  |   6 +-
 datasets/GM0355_zeist/GM0355_zeist.derived.ad |   4 +-
 datasets/GM0355_zeist/graph_values.yml        |   6 +-
 .../GM0356_nieuwegein.derived.ad              |   4 +-
 datasets/GM0356_nieuwegein/graph_values.yml   |   6 +-
 .../GM0358_aalsmeer.derived.ad                |   4 +-
 datasets/GM0358_aalsmeer/graph_values.yml     |   6 +-
 .../GM0361_alkmaar/GM0361_alkmaar.derived.ad  |   4 +-
 datasets/GM0361_alkmaar/graph_values.yml      |   6 +-
 .../GM0362_amstelveen.derived.ad              |   4 +-
 datasets/GM0362_amstelveen/graph_values.yml   |   6 +-
 .../GM0363_amsterdam.derived.ad               |   4 +-
 datasets/GM0363_amsterdam/graph_values.yml    |   6 +-
 .../GM0370_beemster.derived.ad                | 211 ++++++++++++++++++
 datasets/GM0370_beemster/graph_values.yml     |   1 +
 .../GM0373_bergen/GM0373_bergen.derived.ad    |   4 +-
 datasets/GM0373_bergen/graph_values.yml       |   6 +-
 .../GM0375_beverwijk.derived.ad               |   4 +-
 datasets/GM0375_beverwijk/graph_values.yml    |   6 +-
 .../GM0376_blaricum.derived.ad                |   4 +-
 datasets/GM0376_blaricum/graph_values.yml     |   6 +-
 .../GM0377_bloemendaal.derived.ad             |   4 +-
 datasets/GM0377_bloemendaal/graph_values.yml  |   6 +-
 .../GM0383_castricum.derived.ad               |   4 +-
 datasets/GM0383_castricum/graph_values.yml    |   6 +-
 .../GM0384_diemen/GM0384_diemen.derived.ad    |   4 +-
 datasets/GM0384_diemen/graph_values.yml       |   6 +-
 .../GM0385_edam_volendam.derived.ad           |   4 +-
 .../GM0385_edam_volendam/graph_values.yml     |   6 +-
 .../GM0388_enkhuizen.derived.ad               |   4 +-
 datasets/GM0388_enkhuizen/graph_values.yml    |   6 +-
 .../GM0392_haarlem/GM0392_haarlem.derived.ad  |   4 +-
 datasets/GM0392_haarlem/graph_values.yml      |   6 +-
 .../GM0394_haarlemmermeer.derived.ad          |   4 +-
 .../GM0394_haarlemmermeer/graph_values.yml    |   6 +-
 .../GM0396_heemskerk.derived.ad               |   4 +-
 datasets/GM0396_heemskerk/graph_values.yml    |   6 +-
 .../GM0397_heemstede.derived.ad               |   4 +-
 datasets/GM0397_heemstede/graph_values.yml    |   6 +-
 .../GM0399_heiloo/GM0399_heiloo.derived.ad    |   4 +-
 datasets/GM0399_heiloo/graph_values.yml       |   6 +-
 .../GM0400_den_helder.derived.ad              |   4 +-
 datasets/GM0400_den_helder/graph_values.yml   |   6 +-
 .../GM0402_hilversum.derived.ad               |   4 +-
 datasets/GM0402_hilversum/graph_values.yml    |   6 +-
 datasets/GM0405_hoorn/GM0405_hoorn.derived.ad |   4 +-
 datasets/GM0405_hoorn/graph_values.yml        |   6 +-
 .../GM0406_huizen/GM0406_huizen.derived.ad    |   4 +-
 datasets/GM0406_huizen/graph_values.yml       |   6 +-
 .../GM0415_landsmeer.derived.ad               |   4 +-
 datasets/GM0415_landsmeer/graph_values.yml    |   6 +-
 datasets/GM0417_laren/GM0417_laren.derived.ad |   4 +-
 datasets/GM0417_laren/graph_values.yml        |   6 +-
 .../GM0420_medemblik.derived.ad               |   4 +-
 datasets/GM0420_medemblik/graph_values.yml    |   6 +-
 .../GM0431_oostzaan.derived.ad                |   4 +-
 datasets/GM0431_oostzaan/graph_values.yml     |   6 +-
 .../GM0432_opmeer/GM0432_opmeer.derived.ad    |   4 +-
 datasets/GM0432_opmeer/graph_values.yml       |   6 +-
 .../GM0437_ouder_amstel.derived.ad            |   4 +-
 datasets/GM0437_ouder_amstel/graph_values.yml |   6 +-
 .../GM0439_purmerend.derived.ad               |   4 +-
 datasets/GM0439_purmerend/graph_values.yml    |   6 +-
 .../GM0441_schagen/GM0441_schagen.derived.ad  |   4 +-
 datasets/GM0441_schagen/graph_values.yml      |   6 +-
 datasets/GM0448_texel/GM0448_texel.derived.ad |   4 +-
 datasets/GM0448_texel/graph_values.yml        |   6 +-
 .../GM0450_uitgeest.derived.ad                |   4 +-
 datasets/GM0450_uitgeest/graph_values.yml     |   6 +-
 .../GM0451_uithoorn.derived.ad                |   4 +-
 datasets/GM0451_uithoorn/graph_values.yml     |   6 +-
 .../GM0453_velsen/GM0453_velsen.derived.ad    |   4 +-
 datasets/GM0453_velsen/graph_values.yml       |   6 +-
 .../GM0473_zandvoort.derived.ad               |   4 +-
 datasets/GM0473_zandvoort/graph_values.yml    |   6 +-
 .../GM0479_zaanstad.derived.ad                |   4 +-
 datasets/GM0479_zaanstad/graph_values.yml     |   6 +-
 .../GM0482_alblasserdam.derived.ad            |   4 +-
 datasets/GM0482_alblasserdam/graph_values.yml |   6 +-
 .../GM0484_alphen_aan_den_rijn.derived.ad     |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0489_barendrecht.derived.ad             |   4 +-
 datasets/GM0489_barendrecht/graph_values.yml  |   6 +-
 .../GM0498_drechterland.derived.ad            |   4 +-
 datasets/GM0498_drechterland/graph_values.yml |   6 +-
 .../GM0502_capelle_aan_den_ijssel.derived.ad  |   4 +-
 .../graph_values.yml                          |   6 +-
 datasets/GM0503_delft/GM0503_delft.derived.ad |   4 +-
 datasets/GM0503_delft/graph_values.yml        |   6 +-
 .../GM0505_dordrecht.derived.ad               |   4 +-
 datasets/GM0505_dordrecht/graph_values.yml    |   6 +-
 .../GM0512_gorinchem.derived.ad               |   4 +-
 datasets/GM0512_gorinchem/graph_values.yml    |   6 +-
 datasets/GM0513_gouda/GM0513_gouda.derived.ad |   4 +-
 datasets/GM0513_gouda/graph_values.yml        |   6 +-
 .../GM0518_s_gravenhage.derived.ad            |   4 +-
 datasets/GM0518_s_gravenhage/graph_values.yml |   6 +-
 .../GM0523_hardinxveld_giessendam.derived.ad  |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0531_hendrik_ido_ambacht.derived.ad     |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0532_stede_broec.derived.ad             |   4 +-
 datasets/GM0532_stede_broec/graph_values.yml  |   6 +-
 .../GM0534_hillegom.derived.ad                |   4 +-
 datasets/GM0534_hillegom/graph_values.yml     |   6 +-
 .../GM0537_katwijk/GM0537_katwijk.derived.ad  |   4 +-
 datasets/GM0537_katwijk/graph_values.yml      |   6 +-
 .../GM0542_krimpen_aan_den_ijssel.derived.ad  |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0546_leiden/GM0546_leiden.derived.ad    |   4 +-
 datasets/GM0546_leiden/graph_values.yml       |   6 +-
 .../GM0547_leiderdorp.derived.ad              |   4 +-
 datasets/GM0547_leiderdorp/graph_values.yml   |   6 +-
 datasets/GM0553_lisse/GM0553_lisse.derived.ad |   4 +-
 datasets/GM0553_lisse/graph_values.yml        |   6 +-
 .../GM0556_maassluis.derived.ad               |   4 +-
 datasets/GM0556_maassluis/graph_values.yml    |   6 +-
 .../GM0569_nieuwkoop.derived.ad               |   4 +-
 datasets/GM0569_nieuwkoop/graph_values.yml    |   6 +-
 .../GM0575_noordwijk.derived.ad               |   4 +-
 datasets/GM0575_noordwijk/graph_values.yml    |   6 +-
 .../GM0579_oegstgeest.derived.ad              |   4 +-
 datasets/GM0579_oegstgeest/graph_values.yml   |   6 +-
 .../GM0589_oudewater.derived.ad               |   4 +-
 datasets/GM0589_oudewater/graph_values.yml    |   6 +-
 .../GM0590_papendrecht.derived.ad             |   4 +-
 datasets/GM0590_papendrecht/graph_values.yml  |   6 +-
 .../GM0597_ridderkerk.derived.ad              |   4 +-
 datasets/GM0597_ridderkerk/graph_values.yml   |   6 +-
 .../GM0599_rotterdam.derived.ad               |   4 +-
 datasets/GM0599_rotterdam/graph_values.yml    |   6 +-
 .../GM0603_rijswijk.derived.ad                |   4 +-
 datasets/GM0603_rijswijk/graph_values.yml     |   6 +-
 .../GM0606_schiedam.derived.ad                |   4 +-
 datasets/GM0606_schiedam/graph_values.yml     |   6 +-
 .../GM0610_sliedrecht.derived.ad              |   4 +-
 datasets/GM0610_sliedrecht/graph_values.yml   |   6 +-
 .../GM0613_albrandswaard.derived.ad           |   4 +-
 .../GM0613_albrandswaard/graph_values.yml     |   6 +-
 .../GM0622_vlaardingen.derived.ad             |   4 +-
 datasets/GM0622_vlaardingen/graph_values.yml  |   6 +-
 .../GM0626_voorschoten.derived.ad             |   4 +-
 datasets/GM0626_voorschoten/graph_values.yml  |   6 +-
 .../GM0627_waddinxveen.derived.ad             |   4 +-
 datasets/GM0627_waddinxveen/graph_values.yml  |   6 +-
 .../GM0629_wassenaar.derived.ad               |   4 +-
 datasets/GM0629_wassenaar/graph_values.yml    |   6 +-
 .../GM0632_woerden/GM0632_woerden.derived.ad  |   4 +-
 datasets/GM0632_woerden/graph_values.yml      |   6 +-
 .../GM0637_zoetermeer.derived.ad              |   4 +-
 datasets/GM0637_zoetermeer/graph_values.yml   |   6 +-
 .../GM0638_zoeterwoude.derived.ad             |   4 +-
 datasets/GM0638_zoeterwoude/graph_values.yml  |   6 +-
 .../GM0642_zwijndrecht.derived.ad             |   4 +-
 datasets/GM0642_zwijndrecht/graph_values.yml  |   6 +-
 .../GM0654_borsele/GM0654_borsele.derived.ad  |   4 +-
 datasets/GM0654_borsele/graph_values.yml      |   6 +-
 datasets/GM0664_goes/GM0664_goes.derived.ad   |   4 +-
 datasets/GM0664_goes/graph_values.yml         |   6 +-
 .../GM0668_west_maas_en_waal.derived.ad       |   4 +-
 .../GM0668_west_maas_en_waal/graph_values.yml |   6 +-
 datasets/GM0677_hulst/GM0677_hulst.derived.ad |   4 +-
 datasets/GM0677_hulst/graph_values.yml        |   6 +-
 .../GM0678_kapelle/GM0678_kapelle.derived.ad  |   4 +-
 datasets/GM0678_kapelle/graph_values.yml      |   6 +-
 .../GM0687_middelburg.derived.ad              |   4 +-
 datasets/GM0687_middelburg/graph_values.yml   |   6 +-
 .../GM0703_reimerswaal.derived.ad             |   4 +-
 datasets/GM0703_reimerswaal/graph_values.yml  |   6 +-
 .../GM0715_terneuzen.derived.ad               |   4 +-
 datasets/GM0715_terneuzen/graph_values.yml    |   6 +-
 .../GM0716_tholen/GM0716_tholen.derived.ad    |   4 +-
 datasets/GM0716_tholen/graph_values.yml       |   6 +-
 datasets/GM0717_veere/GM0717_veere.derived.ad |   4 +-
 datasets/GM0717_veere/graph_values.yml        |   6 +-
 .../GM0718_vlissingen.derived.ad              |   4 +-
 datasets/GM0718_vlissingen/graph_values.yml   |   6 +-
 .../GM0736_de_ronde_venen.derived.ad          |   4 +-
 .../GM0736_de_ronde_venen/graph_values.yml    |   6 +-
 .../GM0737_tytsjerksteradiel.derived.ad       |   4 +-
 .../GM0737_tytsjerksteradiel/graph_values.yml |   6 +-
 datasets/GM0743_asten/GM0743_asten.derived.ad |   4 +-
 datasets/GM0743_asten/graph_values.yml        |   6 +-
 .../GM0744_baarle_nassau.derived.ad           |   4 +-
 .../GM0744_baarle_nassau/graph_values.yml     |   6 +-
 .../GM0748_bergen_op_zoom.derived.ad          |   4 +-
 .../GM0748_bergen_op_zoom/graph_values.yml    |   6 +-
 datasets/GM0753_best/GM0753_best.derived.ad   |   4 +-
 datasets/GM0753_best/graph_values.yml         |   6 +-
 .../GM0755_boekel/GM0755_boekel.derived.ad    |   4 +-
 datasets/GM0755_boekel/graph_values.yml       |   6 +-
 .../GM0757_boxtel/GM0757_boxtel.derived.ad    |   4 +-
 datasets/GM0757_boxtel/graph_values.yml       |   6 +-
 datasets/GM0758_breda/GM0758_breda.derived.ad |   4 +-
 datasets/GM0758_breda/graph_values.yml        |   6 +-
 .../GM0762_deurne/GM0762_deurne.derived.ad    |   4 +-
 datasets/GM0762_deurne/graph_values.yml       |   6 +-
 .../GM0765_pekela/GM0765_pekela.derived.ad    |   4 +-
 datasets/GM0765_pekela/graph_values.yml       |   6 +-
 .../GM0766_dongen/GM0766_dongen.derived.ad    |   4 +-
 datasets/GM0766_dongen/graph_values.yml       |   6 +-
 .../GM0770_eersel/GM0770_eersel.derived.ad    |   4 +-
 datasets/GM0770_eersel/graph_values.yml       |   6 +-
 .../GM0772_eindhoven.derived.ad               |   4 +-
 datasets/GM0772_eindhoven/graph_values.yml    |   6 +-
 .../GM0777_etten_leur.derived.ad              |   4 +-
 datasets/GM0777_etten_leur/graph_values.yml   |   6 +-
 .../GM0779_geertruidenberg.derived.ad         |   4 +-
 .../GM0779_geertruidenberg/graph_values.yml   |   6 +-
 .../GM0784_gilze_en_rijen.derived.ad          |   4 +-
 .../GM0784_gilze_en_rijen/graph_values.yml    |   6 +-
 .../GM0785_goirle/GM0785_goirle.derived.ad    |   4 +-
 datasets/GM0785_goirle/graph_values.yml       |   6 +-
 .../GM0794_helmond/GM0794_helmond.derived.ad  |   4 +-
 datasets/GM0794_helmond/graph_values.yml      |   8 +-
 .../GM0796_s_hertogenbosch.derived.ad         |   4 +-
 .../GM0796_s_hertogenbosch/graph_values.yml   |   6 +-
 .../GM0797_heusden/GM0797_heusden.derived.ad  |   4 +-
 datasets/GM0797_heusden/graph_values.yml      |   6 +-
 .../GM0798_hilvarenbeek.derived.ad            |   4 +-
 datasets/GM0798_hilvarenbeek/graph_values.yml |   6 +-
 .../GM0809_loon_op_zand.derived.ad            |   4 +-
 datasets/GM0809_loon_op_zand/graph_values.yml |   6 +-
 ...20_nuenen_gerwen_en_nederwetten.derived.ad |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0823_oirschot.derived.ad                |   4 +-
 datasets/GM0823_oirschot/graph_values.yml     |   6 +-
 .../GM0824_oisterwijk.derived.ad              |   4 +-
 datasets/GM0824_oisterwijk/graph_values.yml   |   6 +-
 .../GM0826_oosterhout.derived.ad              |   4 +-
 datasets/GM0826_oosterhout/graph_values.yml   |   6 +-
 datasets/GM0828_oss/GM0828_oss.derived.ad     |   4 +-
 datasets/GM0828_oss/graph_values.yml          |   6 +-
 .../GM0840_rucphen/GM0840_rucphen.derived.ad  |   4 +-
 datasets/GM0840_rucphen/graph_values.yml      |   6 +-
 .../GM0845_sint_michielsgestel.derived.ad     |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0847_someren/GM0847_someren.derived.ad  |   4 +-
 datasets/GM0847_someren/graph_values.yml      |   6 +-
 .../GM0848_son_en_breugel.derived.ad          |   4 +-
 .../GM0848_son_en_breugel/graph_values.yml    |   6 +-
 .../GM0851_steenbergen.derived.ad             |   4 +-
 datasets/GM0851_steenbergen/graph_values.yml  |   6 +-
 .../GM0852_waterland.derived.ad               |   4 +-
 datasets/GM0852_waterland/graph_values.yml    |   6 +-
 .../GM0855_tilburg/GM0855_tilburg.derived.ad  |   4 +-
 datasets/GM0855_tilburg/graph_values.yml      |   6 +-
 .../GM0858_valkenswaard.derived.ad            |   4 +-
 datasets/GM0858_valkenswaard/graph_values.yml |   6 +-
 .../GM0861_veldhoven.derived.ad               |   4 +-
 datasets/GM0861_veldhoven/graph_values.yml    |   6 +-
 datasets/GM0865_vught/GM0865_vught.derived.ad |   4 +-
 datasets/GM0865_vught/graph_values.yml        |   6 +-
 .../GM0866_waalre/GM0866_waalre.derived.ad    |   4 +-
 datasets/GM0866_waalre/graph_values.yml       |   6 +-
 .../GM0867_waalwijk.derived.ad                |   4 +-
 datasets/GM0867_waalwijk/graph_values.yml     |   6 +-
 .../GM0873_woensdrecht.derived.ad             |   4 +-
 datasets/GM0873_woensdrecht/graph_values.yml  |   6 +-
 .../GM0879_zundert/GM0879_zundert.derived.ad  |   4 +-
 datasets/GM0879_zundert/graph_values.yml      |   6 +-
 .../GM0880_wormerland.derived.ad              |   4 +-
 datasets/GM0880_wormerland/graph_values.yml   |   6 +-
 .../GM0882_landgraaf.derived.ad               |   4 +-
 datasets/GM0882_landgraaf/graph_values.yml    |   6 +-
 datasets/GM0888_beek/GM0888_beek.derived.ad   |   4 +-
 datasets/GM0888_beek/graph_values.yml         |   6 +-
 .../GM0889_beesel/GM0889_beesel.derived.ad    |   4 +-
 datasets/GM0889_beesel/graph_values.yml       |   6 +-
 .../GM0893_bergen/GM0893_bergen.derived.ad    |   4 +-
 datasets/GM0893_bergen/graph_values.yml       |   6 +-
 .../GM0899_brunssum.derived.ad                |   4 +-
 datasets/GM0899_brunssum/graph_values.yml     |   6 +-
 .../GM0907_gennep/GM0907_gennep.derived.ad    |   4 +-
 datasets/GM0907_gennep/graph_values.yml       |   6 +-
 .../GM0917_heerlen/GM0917_heerlen.derived.ad  |   4 +-
 datasets/GM0917_heerlen/graph_values.yml      |   6 +-
 .../GM0928_kerkrade.derived.ad                |   4 +-
 datasets/GM0928_kerkrade/graph_values.yml     |   6 +-
 .../GM0935_maastricht.derived.ad              |   4 +-
 datasets/GM0935_maastricht/graph_values.yml   |   6 +-
 .../GM0938_meerssen.derived.ad                |   4 +-
 datasets/GM0938_meerssen/graph_values.yml     |   6 +-
 .../GM0944_mook_en_middelaar.derived.ad       |   4 +-
 .../GM0944_mook_en_middelaar/graph_values.yml |   6 +-
 .../GM0946_nederweert.derived.ad              |   4 +-
 datasets/GM0946_nederweert/graph_values.yml   |   6 +-
 .../GM0957_roermond.derived.ad                |   4 +-
 datasets/GM0957_roermond/graph_values.yml     |   6 +-
 .../GM0965_simpelveld.derived.ad              |   4 +-
 datasets/GM0965_simpelveld/graph_values.yml   |   6 +-
 datasets/GM0971_stein/GM0971_stein.derived.ad |   4 +-
 datasets/GM0971_stein/graph_values.yml        |   6 +-
 datasets/GM0981_vaals/GM0981_vaals.derived.ad |   4 +-
 datasets/GM0981_vaals/graph_values.yml        |   6 +-
 datasets/GM0983_venlo/GM0983_venlo.derived.ad |   4 +-
 datasets/GM0983_venlo/graph_values.yml        |   6 +-
 .../GM0984_venray/GM0984_venray.derived.ad    |   4 +-
 datasets/GM0984_venray/graph_values.yml       |   6 +-
 .../GM0986_voerendaal.derived.ad              |   4 +-
 datasets/GM0986_voerendaal/graph_values.yml   |   6 +-
 datasets/GM0988_weert/GM0988_weert.derived.ad |   4 +-
 datasets/GM0988_weert/graph_values.yml        |   6 +-
 .../GM0994_valkenburg_aan_de_geul.derived.ad  |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0995_lelystad.derived.ad                |   4 +-
 datasets/GM0995_lelystad/graph_values.yml     |   6 +-
 .../GM1507_horst_aan_de_maas.derived.ad       |   4 +-
 .../GM1507_horst_aan_de_maas/graph_values.yml |   6 +-
 .../GM1509_oude_ijsselstreek.derived.ad       |   4 +-
 .../GM1509_oude_ijsselstreek/graph_values.yml |   6 +-
 .../GM1525_teylingen.derived.ad               |   4 +-
 datasets/GM1525_teylingen/graph_values.yml    |   6 +-
 .../GM1581_utrechtse_heuvelrug.derived.ad     |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1586_oost_gelre.derived.ad              |   4 +-
 datasets/GM1586_oost_gelre/graph_values.yml   |   6 +-
 .../GM1598_koggenland.derived.ad              |   4 +-
 datasets/GM1598_koggenland/graph_values.yml   |   6 +-
 .../GM1621_lansingerland.derived.ad           |   4 +-
 .../GM1621_lansingerland/graph_values.yml     |   6 +-
 .../GM1640_leudal/GM1640_leudal.derived.ad    |   4 +-
 datasets/GM1640_leudal/graph_values.yml       |   6 +-
 .../GM1641_maasgouw.derived.ad                |   4 +-
 datasets/GM1641_maasgouw/graph_values.yml     |   6 +-
 .../GM1652_gemert_bakel.derived.ad            |   4 +-
 datasets/GM1652_gemert_bakel/graph_values.yml |   6 +-
 .../GM1655_halderberge.derived.ad             |   4 +-
 datasets/GM1655_halderberge/graph_values.yml  |   6 +-
 .../GM1658_heeze_leende.derived.ad            |   4 +-
 datasets/GM1658_heeze_leende/graph_values.yml |   6 +-
 .../GM1659_laarbeek.derived.ad                |   4 +-
 datasets/GM1659_laarbeek/graph_values.yml     |   6 +-
 .../GM1667_reusel_de_mierden.derived.ad       |   4 +-
 .../GM1667_reusel_de_mierden/graph_values.yml |   6 +-
 .../GM1669_roerdalen.derived.ad               |   4 +-
 datasets/GM1669_roerdalen/graph_values.yml    |   6 +-
 .../GM1674_roosendaal.derived.ad              |   4 +-
 datasets/GM1674_roosendaal/graph_values.yml   |   6 +-
 .../GM1676_schouwen_duiveland.derived.ad      |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1680_aa_en_hunze.derived.ad             |   4 +-
 datasets/GM1680_aa_en_hunze/graph_values.yml  |   6 +-
 .../GM1681_borger_odoorn.derived.ad           |   4 +-
 .../GM1681_borger_odoorn/graph_values.yml     |   6 +-
 .../GM1690_de_wolden.derived.ad               |   4 +-
 datasets/GM1690_de_wolden/graph_values.yml    |   6 +-
 .../GM1695_noord_beveland.derived.ad          |   4 +-
 .../GM1695_noord_beveland/graph_values.yml    |   6 +-
 .../GM1696_wijdemeren.derived.ad              |   4 +-
 datasets/GM1696_wijdemeren/graph_values.yml   |   6 +-
 .../GM1699_noordenveld.derived.ad             |   4 +-
 datasets/GM1699_noordenveld/graph_values.yml  |   6 +-
 .../GM1700_twenterand.derived.ad              |   4 +-
 datasets/GM1700_twenterand/graph_values.yml   |   6 +-
 .../GM1701_westerveld.derived.ad              |   4 +-
 datasets/GM1701_westerveld/graph_values.yml   |   6 +-
 .../GM1705_lingewaard.derived.ad              |   4 +-
 datasets/GM1705_lingewaard/graph_values.yml   |   6 +-
 .../GM1706_cranendonck.derived.ad             |   4 +-
 datasets/GM1706_cranendonck/graph_values.yml  |   6 +-
 .../GM1708_steenwijkerland.derived.ad         |   4 +-
 .../GM1708_steenwijkerland/graph_values.yml   |   6 +-
 .../GM1709_moerdijk.derived.ad                |   4 +-
 datasets/GM1709_moerdijk/graph_values.yml     |   6 +-
 .../GM1711_echt_susteren.derived.ad           |   4 +-
 .../GM1711_echt_susteren/graph_values.yml     |   6 +-
 datasets/GM1714_sluis/GM1714_sluis.derived.ad |   4 +-
 datasets/GM1714_sluis/graph_values.yml        |   6 +-
 .../GM1719_drimmelen.derived.ad               |   4 +-
 datasets/GM1719_drimmelen/graph_values.yml    |   6 +-
 .../GM1721_bernheze.derived.ad                |   4 +-
 datasets/GM1721_bernheze/graph_values.yml     |   6 +-
 .../GM1723_alphen_chaam.derived.ad            |   4 +-
 datasets/GM1723_alphen_chaam/graph_values.yml |   6 +-
 .../GM1724_bergeijk.derived.ad                |   4 +-
 datasets/GM1724_bergeijk/graph_values.yml     |   6 +-
 .../GM1728_bladel/GM1728_bladel.derived.ad    |   4 +-
 datasets/GM1728_bladel/graph_values.yml       |   6 +-
 .../GM1729_gulpen_wittem.derived.ad           |   4 +-
 .../GM1729_gulpen_wittem/graph_values.yml     |   6 +-
 .../GM1730_tynaarlo.derived.ad                |   4 +-
 datasets/GM1730_tynaarlo/graph_values.yml     |   6 +-
 .../GM1731_midden_drenthe.derived.ad          |   4 +-
 .../GM1731_midden_drenthe/graph_values.yml    |   6 +-
 .../GM1734_overbetuwe.derived.ad              |   4 +-
 datasets/GM1734_overbetuwe/graph_values.yml   |   6 +-
 .../GM1735_hof_van_twente.derived.ad          |   4 +-
 .../GM1735_hof_van_twente/graph_values.yml    |   6 +-
 .../GM1740_neder_betuwe.derived.ad            |   4 +-
 datasets/GM1740_neder_betuwe/graph_values.yml |   6 +-
 .../GM1742_rijssen_holten.derived.ad          |   4 +-
 .../GM1742_rijssen_holten/graph_values.yml    |   6 +-
 .../GM1771_geldrop_mierlo.derived.ad          |   4 +-
 .../GM1771_geldrop_mierlo/graph_values.yml    |   6 +-
 .../GM1773_olst_wijhe.derived.ad              |   4 +-
 datasets/GM1773_olst_wijhe/graph_values.yml   |   6 +-
 .../GM1774_dinkelland.derived.ad              |   4 +-
 datasets/GM1774_dinkelland/graph_values.yml   |   6 +-
 .../GM1783_westland.derived.ad                |   4 +-
 datasets/GM1783_westland/graph_values.yml     |   6 +-
 .../GM1842_midden_delfland.derived.ad         |   4 +-
 .../GM1842_midden_delfland/graph_values.yml   |   6 +-
 .../GM1859_berkelland.derived.ad              |   4 +-
 datasets/GM1859_berkelland/graph_values.yml   |   6 +-
 .../GM1876_bronckhorst.derived.ad             |   4 +-
 datasets/GM1876_bronckhorst/graph_values.yml  |   6 +-
 .../GM1883_sittard_geleen.derived.ad          |   4 +-
 .../GM1883_sittard_geleen/graph_values.yml    |   6 +-
 .../GM1884_kaag_en_braassem.derived.ad        |   4 +-
 .../GM1884_kaag_en_braassem/graph_values.yml  |   6 +-
 .../GM1891_dantumadiel.derived.ad             |   4 +-
 datasets/GM1891_dantumadiel/graph_values.yml  |   6 +-
 .../GM1892_zuidplas.derived.ad                |   4 +-
 datasets/GM1892_zuidplas/graph_values.yml     |   6 +-
 .../GM1894_peel_en_maas.derived.ad            |   4 +-
 datasets/GM1894_peel_en_maas/graph_values.yml |   6 +-
 .../GM1895_oldambt/GM1895_oldambt.derived.ad  |   4 +-
 datasets/GM1895_oldambt/graph_values.yml      |   6 +-
 .../GM1896_zwartewaterland.derived.ad         |   4 +-
 .../GM1896_zwartewaterland/graph_values.yml   |   6 +-
 .../GM1900_sudwest_fryslan.derived.ad         |   4 +-
 .../GM1900_sudwest_fryslan/graph_values.yml   |   6 +-
 .../GM1901_bodegraven_reeuwijk.derived.ad     |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1903_eijsden_margraten.derived.ad       |   4 +-
 .../GM1903_eijsden_margraten/graph_values.yml |   6 +-
 .../GM1904_stichtse_vecht.derived.ad          |   4 +-
 .../GM1904_stichtse_vecht/graph_values.yml    |   6 +-
 .../GM1911_hollands_kroon.derived.ad          |   4 +-
 .../GM1911_hollands_kroon/graph_values.yml    |   6 +-
 .../GM1916_leidschendam_voorburg.derived.ad   |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1924_goeree_overflakkee.derived.ad      |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1926_pijnacker_nootdorp.derived.ad      |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1930_nissewaard.derived.ad              |   4 +-
 datasets/GM1930_nissewaard/graph_values.yml   |   6 +-
 .../GM1931_krimpenerwaard.derived.ad          |   4 +-
 .../GM1931_krimpenerwaard/graph_values.yml    |   6 +-
 .../GM1940_de_fryske_marren.derived.ad        |   4 +-
 .../GM1940_de_fryske_marren/graph_values.yml  |   6 +-
 .../GM1942_gooise_meren.derived.ad            |   4 +-
 datasets/GM1942_gooise_meren/graph_values.yml |   6 +-
 .../GM1945_berg_en_dal.derived.ad             |   4 +-
 datasets/GM1945_berg_en_dal/graph_values.yml  |   6 +-
 .../GM1948_meierijstad.derived.ad             |   4 +-
 datasets/GM1948_meierijstad/graph_values.yml  |   6 +-
 .../GM1949_waadhoeke.derived.ad               |   4 +-
 datasets/GM1949_waadhoeke/graph_values.yml    |   6 +-
 .../GM1950_westerwolde.derived.ad             |   4 +-
 datasets/GM1950_westerwolde/graph_values.yml  |   6 +-
 .../GM1952_midden_groningen.derived.ad        |   4 +-
 .../GM1952_midden_groningen/graph_values.yml  |   6 +-
 .../GM1954_beekdaelen.derived.ad              |   4 +-
 datasets/GM1954_beekdaelen/graph_values.yml   |   6 +-
 .../GM1955_montferland.derived.ad             |   4 +-
 datasets/GM1955_montferland/graph_values.yml  |   6 +-
 .../GM1959_altena/GM1959_altena.derived.ad    |   4 +-
 datasets/GM1959_altena/graph_values.yml       |   6 +-
 .../GM1960_west_betuwe.derived.ad             |   4 +-
 datasets/GM1960_west_betuwe/graph_values.yml  |   6 +-
 .../GM1961_vijfheerenlanden.derived.ad        |   4 +-
 .../GM1961_vijfheerenlanden/graph_values.yml  |   6 +-
 .../GM1963_hoeksche_waard.derived.ad          |   4 +-
 .../GM1963_hoeksche_waard/graph_values.yml    |   6 +-
 .../GM1966_het_hogeland.derived.ad            |   4 +-
 datasets/GM1966_het_hogeland/graph_values.yml |   6 +-
 .../GM1969_westerkwartier.derived.ad          |   4 +-
 .../GM1969_westerkwartier/graph_values.yml    |   6 +-
 .../GM1970_noardeast_fryslan.derived.ad       |   4 +-
 .../GM1970_noardeast_fryslan/graph_values.yml |   6 +-
 .../GM1978_molenlanden.derived.ad             |   4 +-
 datasets/GM1978_molenlanden/graph_values.yml  |   6 +-
 .../GM1979_eemsdelta.derived.ad               |   4 +-
 datasets/GM1979_eemsdelta/graph_values.yml    |   6 +-
 .../GM1980_dijk_en_waard.derived.ad           |   4 +-
 .../GM1980_dijk_en_waard/graph_values.yml     |   6 +-
 .../GM1982_land_van_cuijk.derived.ad          |   4 +-
 .../GM1982_land_van_cuijk/graph_values.yml    |   6 +-
 .../GM1991_maashorst.derived.ad               |   4 +-
 datasets/GM1991_maashorst/graph_values.yml    |   6 +-
 .../GM1992_voorne_aan_zee.derived.ad          |   4 +-
 .../GM1992_voorne_aan_zee/graph_values.yml    |   6 +-
 686 files changed, 1923 insertions(+), 1711 deletions(-)
 create mode 100644 datasets/GM0370_beemster/GM0370_beemster.derived.ad
 create mode 100644 datasets/GM0370_beemster/graph_values.yml

diff --git a/datasets/GM0014_groningen/GM0014_groningen.derived.ad b/datasets/GM0014_groningen/GM0014_groningen.derived.ad
index 62e94cfd68..fb1dc441f2 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 = 126757
-- parent_id = 126757
+- id = 127206
+- parent_id = 127206
 - 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 4b4e105e08..046f00c877 100644
--- a/datasets/GM0014_groningen/graph_values.yml
+++ b/datasets/GM0014_groningen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.537288804
+  max_demand: 537.2888
 energy_production_oily_biomass:
-  max_demand: 0.12383285
+  max_demand: 123.83285
 energy_production_wet_biomass:
-  max_demand: 0.399862428
+  max_demand: 399.86243
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0034_almere/GM0034_almere.derived.ad b/datasets/GM0034_almere/GM0034_almere.derived.ad
index 318a342712..195991301a 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 = 126662
-- parent_id = 126662
+- id = 127111
+- parent_id = 127111
 - 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 7a4dd0ab07..9a6a49ca30 100644
--- a/datasets/GM0034_almere/graph_values.yml
+++ b/datasets/GM0034_almere/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.610690855
+  max_demand: 610.69086
 energy_production_oily_biomass:
-  max_demand: 0.126314744
+  max_demand: 126.31474
 energy_production_wet_biomass:
-  max_demand: 0.588570111
+  max_demand: 588.57011
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad b/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad
index ba4bff9bd2..df95471a18 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 = 126902
-- parent_id = 126902
+- id = 127351
+- parent_id = 127351
 - 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 671efc9cab..4ed70f0b9f 100644
--- a/datasets/GM0037_stadskanaal/graph_values.yml
+++ b/datasets/GM0037_stadskanaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.15903103
+  max_demand: 159.03103
 energy_production_oily_biomass:
-  max_demand: 0.019313815
+  max_demand: 19.31382
 energy_production_wet_biomass:
-  max_demand: 0.206689826
+  max_demand: 206.68983
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0047_veendam/GM0047_veendam.derived.ad b/datasets/GM0047_veendam/GM0047_veendam.derived.ad
index cd2e056b40..ce219d9865 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 = 126929
-- parent_id = 126929
+- id = 127378
+- parent_id = 127378
 - 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 4c4e6a897c..aca7549306 100644
--- a/datasets/GM0047_veendam/graph_values.yml
+++ b/datasets/GM0047_veendam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.108689181
+  max_demand: 108.68918
 energy_production_oily_biomass:
-  max_demand: 0.01670251
+  max_demand: 16.70251
 energy_production_wet_biomass:
-  max_demand: 0.137042526
+  max_demand: 137.04253
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad b/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad
index 56dcbcfaa7..180cf0ebb8 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 = 126967
-- parent_id = 126967
+- id = 127416
+- parent_id = 127416
 - 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 40a2cec803..01563bcdaf 100644
--- a/datasets/GM0050_zeewolde/graph_values.yml
+++ b/datasets/GM0050_zeewolde/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.219134218
+  max_demand: 219.13422
 energy_production_oily_biomass:
-  max_demand: 0.013554119
+  max_demand: 13.55412
 energy_production_wet_biomass:
-  max_demand: 0.959882971
+  max_demand: 959.88297
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad b/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad
index a6965f3623..748bbd7b07 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 = 126657
-- parent_id = 126657
+- id = 127106
+- parent_id = 127106
 - 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 1fac638677..7a0d55639a 100644
--- a/datasets/GM0059_achtkarspelen/graph_values.yml
+++ b/datasets/GM0059_achtkarspelen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.150534262
+  max_demand: 150.53426
 energy_production_oily_biomass:
-  max_demand: 0.01692184
+  max_demand: 16.92184
 energy_production_wet_biomass:
-  max_demand: 0.206593892
+  max_demand: 206.59389
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0060_ameland/GM0060_ameland.derived.ad b/datasets/GM0060_ameland/GM0060_ameland.derived.ad
index 96859a5cc4..55d65838b9 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 = 126665
-- parent_id = 126665
+- id = 127114
+- parent_id = 127114
 - 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 918414cfc0..84122c5e6d 100644
--- a/datasets/GM0060_ameland/graph_values.yml
+++ b/datasets/GM0060_ameland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.017046558
+  max_demand: 17.04656
 energy_production_oily_biomass:
-  max_demand: 0.002231578
+  max_demand: 2.23158
 energy_production_wet_biomass:
-  max_demand: 0.095491631
+  max_demand: 95.49163
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad b/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad
index 82dbb89bbd..e6e09bc43e 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 = 126766
-- parent_id = 126766
+- id = 127215
+- parent_id = 127215
 - 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 4989a89d54..431e454bc3 100644
--- a/datasets/GM0072_harlingen/graph_values.yml
+++ b/datasets/GM0072_harlingen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.047885
+  max_demand: 47.885
 energy_production_oily_biomass:
-  max_demand: 0.009573975
+  max_demand: 9.57398
 energy_production_wet_biomass:
-  max_demand: 0.075143256
+  max_demand: 75.14326
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad b/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad
index 2dd0b7f865..58e07e9a3a 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 = 126771
-- parent_id = 126771
+- id = 127220
+- parent_id = 127220
 - 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 b02a1a275f..5ff168df7d 100644
--- a/datasets/GM0074_heerenveen/graph_values.yml
+++ b/datasets/GM0074_heerenveen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.23204634
+  max_demand: 232.04634
 energy_production_oily_biomass:
-  max_demand: 0.030534286
+  max_demand: 30.53429
 energy_production_wet_biomass:
-  max_demand: 0.502009306
+  max_demand: 502.00931
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad b/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad
index 53f109f32c..8b9a809f4e 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 = 126806
-- parent_id = 126806
+- id = 127255
+- parent_id = 127255
 - 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 e9d52e4cb0..9277fb7c2e 100644
--- a/datasets/GM0080_leeuwarden/graph_values.yml
+++ b/datasets/GM0080_leeuwarden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.383663739
+  max_demand: 383.66374
 energy_production_oily_biomass:
-  max_demand: 0.074795238
+  max_demand: 74.79524
 energy_production_wet_biomass:
-  max_demand: 0.780985638
+  max_demand: 780.98564
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad b/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad
index 4ecfe37fb7..3713329ac4 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 = 126856
-- parent_id = 126856
+- id = 127305
+- parent_id = 127305
 - 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 b6c2a9e6ec..13b22c8630 100644
--- a/datasets/GM0085_ooststellingwerf/graph_values.yml
+++ b/datasets/GM0085_ooststellingwerf/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.188756067
+  max_demand: 188.75607
 energy_production_oily_biomass:
-  max_demand: 0.01549103
+  max_demand: 15.49103
 energy_production_wet_biomass:
-  max_demand: 0.524225871
+  max_demand: 524.22587
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad b/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad
index a8444a4652..655481f0e5 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 = 126859
-- parent_id = 126859
+- id = 127308
+- parent_id = 127308
 - 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 27d3564e4c..f08c407663 100644
--- a/datasets/GM0086_opsterland/graph_values.yml
+++ b/datasets/GM0086_opsterland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.161587388
+  max_demand: 161.58739
 energy_production_oily_biomass:
-  max_demand: 0.01805859
+  max_demand: 18.05859
 energy_production_wet_biomass:
-  max_demand: 0.446875832
+  max_demand: 446.87583
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad b/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad
index ca7120ae61..3b7c177b3e 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 = 126890
-- parent_id = 126890
+- id = 127339
+- parent_id = 127339
 - 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 06ddd2d519..392055a21a 100644
--- a/datasets/GM0088_schiermonnikoog/graph_values.yml
+++ b/datasets/GM0088_schiermonnikoog/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.005906615
+  max_demand: 5.90662
 energy_production_oily_biomass:
-  max_demand: 0.000568679
+  max_demand: 0.56868
 energy_production_wet_biomass:
-  max_demand: 0.117069075
+  max_demand: 117.06908
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad b/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad
index d0220e80a0..077cc5b533 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 = 126898
-- parent_id = 126898
+- id = 127347
+- parent_id = 127347
 - 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 5f5d5d187c..3bbdf88fca 100644
--- a/datasets/GM0090_smallingerland/graph_values.yml
+++ b/datasets/GM0090_smallingerland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.192053738
+  max_demand: 192.05374
 energy_production_oily_biomass:
-  max_demand: 0.03398585
+  max_demand: 33.98585
 energy_production_wet_biomass:
-  max_demand: 0.367940871
+  max_demand: 367.94087
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad b/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad
index a1b1739f00..4d37f9b7e4 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 = 126911
-- parent_id = 126911
+- id = 127360
+- parent_id = 127360
 - 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 e75b198c14..6c47368f5a 100644
--- a/datasets/GM0093_terschelling/graph_values.yml
+++ b/datasets/GM0093_terschelling/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.023914376
+  max_demand: 23.91438
 energy_production_oily_biomass:
-  max_demand: 0.002970982
+  max_demand: 2.97098
 energy_production_wet_biomass:
-  max_demand: 0.19397981
+  max_demand: 193.97981
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad b/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad
index ec97f48e3a..c537d671b8 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 = 126937
-- parent_id = 126937
+- id = 127386
+- parent_id = 127386
 - 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 a84deede61..e66629978f 100644
--- a/datasets/GM0096_vlieland/graph_values.yml
+++ b/datasets/GM0096_vlieland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.006847427
+  max_demand: 6.84743
 energy_production_oily_biomass:
-  max_demand: 0.000691407
+  max_demand: 0.69141
 energy_production_wet_biomass:
-  max_demand: 0.023221151
+  max_demand: 23.22115
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad b/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad
index 14af394eae..9c06f48deb 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 = 126954
-- parent_id = 126954
+- id = 127403
+- parent_id = 127403
 - 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 1911a55d26..609afc9763 100644
--- a/datasets/GM0098_weststellingwerf/graph_values.yml
+++ b/datasets/GM0098_weststellingwerf/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.16617119
+  max_demand: 166.17119
 energy_production_oily_biomass:
-  max_demand: 0.015699424
+  max_demand: 15.69942
 energy_production_wet_biomass:
-  max_demand: 0.644779897
+  max_demand: 644.7799
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0106_assen/GM0106_assen.derived.ad b/datasets/GM0106_assen/GM0106_assen.derived.ad
index f082b72a90..68eb16df25 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 = 126671
-- parent_id = 126671
+- id = 127120
+- parent_id = 127120
 - 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 f38065d5a5..e40c71530c 100644
--- a/datasets/GM0106_assen/graph_values.yml
+++ b/datasets/GM0106_assen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.203385757
+  max_demand: 203.38576
 energy_production_oily_biomass:
-  max_demand: 0.041291793
+  max_demand: 41.29179
 energy_production_wet_biomass:
-  max_demand: 0.176288465
+  max_demand: 176.28847
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad b/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad
index 057195adac..ff2b97be0e 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 = 126707
-- parent_id = 126707
+- id = 127156
+- parent_id = 127156
 - 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 7755afeca3..6d8de67ce8 100644
--- a/datasets/GM0109_coevorden/graph_values.yml
+++ b/datasets/GM0109_coevorden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.212846906
+  max_demand: 212.84691
 energy_production_oily_biomass:
-  max_demand: 0.021558152
+  max_demand: 21.55815
 energy_production_wet_biomass:
-  max_demand: 0.554110241
+  max_demand: 554.11024
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0114_emmen/GM0114_emmen.derived.ad b/datasets/GM0114_emmen/GM0114_emmen.derived.ad
index c55d261607..c143d55c9e 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 = 126740
-- parent_id = 126740
+- id = 127189
+- parent_id = 127189
 - 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 5d61ae6f78..4c4cb555e8 100644
--- a/datasets/GM0114_emmen/graph_values.yml
+++ b/datasets/GM0114_emmen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.443555329
+  max_demand: 443.55533
 energy_production_oily_biomass:
-  max_demand: 0.065077878
+  max_demand: 65.07788
 energy_production_wet_biomass:
-  max_demand: 0.706690169
+  max_demand: 706.69017
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad b/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad
index e1a7ca5d96..f7c179e828 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 = 126786
-- parent_id = 126786
+- id = 127235
+- parent_id = 127235
 - 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 90bb6b41d1..42c2d9c05e 100644
--- a/datasets/GM0118_hoogeveen/graph_values.yml
+++ b/datasets/GM0118_hoogeveen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.19755345
+  max_demand: 197.55345
 energy_production_oily_biomass:
-  max_demand: 0.033818163
+  max_demand: 33.81816
 energy_production_wet_biomass:
-  max_demand: 0.2697837
+  max_demand: 269.7837
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0119_meppel/GM0119_meppel.derived.ad b/datasets/GM0119_meppel/GM0119_meppel.derived.ad
index acf2dcece7..62692689cb 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 = 126825
-- parent_id = 126825
+- id = 127274
+- parent_id = 127274
 - 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 a324e60a44..2ea56bba89 100644
--- a/datasets/GM0119_meppel/graph_values.yml
+++ b/datasets/GM0119_meppel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.102560643
+  max_demand: 102.56064
 energy_production_oily_biomass:
-  max_demand: 0.020392239
+  max_demand: 20.39224
 energy_production_wet_biomass:
-  max_demand: 0.148439297
+  max_demand: 148.4393
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0141_almelo/GM0141_almelo.derived.ad b/datasets/GM0141_almelo/GM0141_almelo.derived.ad
index 42dece05d1..8c0793fee4 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 = 126661
-- parent_id = 126661
+- id = 127110
+- parent_id = 127110
 - 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 312181c72e..7967478f62 100644
--- a/datasets/GM0141_almelo/graph_values.yml
+++ b/datasets/GM0141_almelo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.22426839
+  max_demand: 224.26839
 energy_production_oily_biomass:
-  max_demand: 0.044260345
+  max_demand: 44.26035
 energy_production_wet_biomass:
-  max_demand: 0.218592151
+  max_demand: 218.59215
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0147_borne/GM0147_borne.derived.ad b/datasets/GM0147_borne/GM0147_borne.derived.ad
index 6089966367..c74b82e7e0 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 = 126695
-- parent_id = 126695
+- id = 127144
+- parent_id = 127144
 - 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 2891130311..7ff5dcd435 100644
--- a/datasets/GM0147_borne/graph_values.yml
+++ b/datasets/GM0147_borne/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.06674801
+  max_demand: 66.74801
 energy_production_oily_biomass:
-  max_demand: 0.014101533
+  max_demand: 14.10153
 energy_production_wet_biomass:
-  max_demand: 0.068191568
+  max_demand: 68.19157
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad b/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad
index c309179ecf..02301929c7 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 = 126710
-- parent_id = 126710
+- id = 127159
+- parent_id = 127159
 - 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 7625c08ab3..b87a6c68b8 100644
--- a/datasets/GM0148_dalfsen/graph_values.yml
+++ b/datasets/GM0148_dalfsen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.179927093
+  max_demand: 179.92709
 energy_production_oily_biomass:
-  max_demand: 0.017314933
+  max_demand: 17.31493
 energy_production_wet_biomass:
-  max_demand: 0.381795394
+  max_demand: 381.79539
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0150_deventer/GM0150_deventer.derived.ad b/datasets/GM0150_deventer/GM0150_deventer.derived.ad
index a45ade753e..2469c46091 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 = 126720
-- parent_id = 126720
+- id = 127169
+- parent_id = 127169
 - 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 72f0729671..8dde09d98a 100644
--- a/datasets/GM0150_deventer/graph_values.yml
+++ b/datasets/GM0150_deventer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.347770519
+  max_demand: 347.77052
 energy_production_oily_biomass:
-  max_demand: 0.060730159
+  max_demand: 60.73016
 energy_production_wet_biomass:
-  max_demand: 0.390080315
+  max_demand: 390.08032
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0153_enschede/GM0153_enschede.derived.ad b/datasets/GM0153_enschede/GM0153_enschede.derived.ad
index 9e2778ee77..194808166e 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 = 126742
-- parent_id = 126742
+- id = 127191
+- parent_id = 127191
 - 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 a138c0ac7c..9b6fbd6090 100644
--- a/datasets/GM0153_enschede/graph_values.yml
+++ b/datasets/GM0153_enschede/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.461455061
+  max_demand: 461.45506
 energy_production_oily_biomass:
-  max_demand: 0.096593985
+  max_demand: 96.59399
 energy_production_wet_biomass:
-  max_demand: 0.374643825
+  max_demand: 374.64383
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad b/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad
index 9b60a266cd..f13476c53f 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 = 126759
-- parent_id = 126759
+- id = 127208
+- parent_id = 127208
 - 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 e65dd6c19f..048cb4188b 100644
--- a/datasets/GM0158_haaksbergen/graph_values.yml
+++ b/datasets/GM0158_haaksbergen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.108370593
+  max_demand: 108.37059
 energy_production_oily_biomass:
-  max_demand: 0.014749803
+  max_demand: 14.7498
 energy_production_wet_biomass:
-  max_demand: 0.257756656
+  max_demand: 257.75666
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad b/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad
index 8100b46190..d9e283a2a7 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 = 126763
-- parent_id = 126763
+- id = 127212
+- parent_id = 127212
 - 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 fe80935583..43a2f65c1f 100644
--- a/datasets/GM0160_hardenberg/graph_values.yml
+++ b/datasets/GM0160_hardenberg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.412431931
+  max_demand: 412.43193
 energy_production_oily_biomass:
-  max_demand: 0.036802511
+  max_demand: 36.80251
 energy_production_wet_biomass:
-  max_demand: 0.691031424
+  max_demand: 691.03142
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad b/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad
index f47262fb9e..99b64d1a91 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 = 126775
-- parent_id = 126775
+- id = 127224
+- parent_id = 127224
 - 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 7f87beb6e1..25215d4b99 100644
--- a/datasets/GM0163_hellendoorn/graph_values.yml
+++ b/datasets/GM0163_hellendoorn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.178835774
+  max_demand: 178.83577
 energy_production_oily_biomass:
-  max_demand: 0.02175561
+  max_demand: 21.75561
 energy_production_wet_biomass:
-  max_demand: 0.300837787
+  max_demand: 300.83779
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad b/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad
index 2d4a6b8e6f..ac3c87ca69 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 = 126778
-- parent_id = 126778
+- id = 127227
+- parent_id = 127227
 - 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 c1ace70c6b..30b6e43426 100644
--- a/datasets/GM0164_hengelo/graph_values.yml
+++ b/datasets/GM0164_hengelo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.219712023
+  max_demand: 219.71202
 energy_production_oily_biomass:
-  max_demand: 0.049019992
+  max_demand: 49.01999
 energy_production_wet_biomass:
-  max_demand: 0.178553177
+  max_demand: 178.55318
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0166_kampen/GM0166_kampen.derived.ad b/datasets/GM0166_kampen/GM0166_kampen.derived.ad
index 0d4dbdb39c..bbdfa5cb83 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 = 126794
-- parent_id = 126794
+- id = 127243
+- parent_id = 127243
 - 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 7feef723ec..2338640f33 100644
--- a/datasets/GM0166_kampen/graph_values.yml
+++ b/datasets/GM0166_kampen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.187949388
+  max_demand: 187.94939
 energy_production_oily_biomass:
-  max_demand: 0.032674122
+  max_demand: 32.67412
 energy_production_wet_biomass:
-  max_demand: 0.419517923
+  max_demand: 419.51792
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0168_losser/GM0168_losser.derived.ad b/datasets/GM0168_losser/GM0168_losser.derived.ad
index 26a2e57829..d552d3132f 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 = 126818
-- parent_id = 126818
+- id = 127267
+- parent_id = 127267
 - 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 397d28585e..0dce3dc242 100644
--- a/datasets/GM0168_losser/graph_values.yml
+++ b/datasets/GM0168_losser/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.103282124
+  max_demand: 103.28212
 energy_production_oily_biomass:
-  max_demand: 0.013744287
+  max_demand: 13.74429
 energy_production_wet_biomass:
-  max_demand: 0.199737622
+  max_demand: 199.73762
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad b/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad
index a286b19204..8804978b7b 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 = 126842
-- parent_id = 126842
+- id = 127291
+- parent_id = 127291
 - 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 3966cbcdc9..8d34ba508c 100644
--- a/datasets/GM0171_noordoostpolder/graph_values.yml
+++ b/datasets/GM0171_noordoostpolder/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.306547142
+  max_demand: 306.54714
 energy_production_oily_biomass:
-  max_demand: 0.02847161
+  max_demand: 28.47161
 energy_production_wet_biomass:
-  max_demand: 2.122553205
+  max_demand: 2122.55321
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad b/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad
index 38df3e7dfb..58f3e39887 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 = 126851
-- parent_id = 126851
+- id = 127300
+- parent_id = 127300
 - 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 5d446815db..59a656a3b1 100644
--- a/datasets/GM0173_oldenzaal/graph_values.yml
+++ b/datasets/GM0173_oldenzaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.086661021
+  max_demand: 86.66102
 energy_production_oily_biomass:
-  max_demand: 0.019344801
+  max_demand: 19.3448
 energy_production_wet_biomass:
-  max_demand: 0.062176951
+  max_demand: 62.17695
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0175_ommen/GM0175_ommen.derived.ad b/datasets/GM0175_ommen/GM0175_ommen.derived.ad
index 4bb2b6ec1d..0b5d6fb6fd 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 = 126853
-- parent_id = 126853
+- id = 127302
+- parent_id = 127302
 - 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 8f581e0d80..37ae2d222f 100644
--- a/datasets/GM0175_ommen/graph_values.yml
+++ b/datasets/GM0175_ommen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.165863958
+  max_demand: 165.86396
 energy_production_oily_biomass:
-  max_demand: 0.010822517
+  max_demand: 10.82252
 energy_production_wet_biomass:
-  max_demand: 0.386863542
+  max_demand: 386.86354
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0177_raalte/GM0177_raalte.derived.ad b/datasets/GM0177_raalte/GM0177_raalte.derived.ad
index 13c0c4808f..bf8f5bf06e 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 = 126871
-- parent_id = 126871
+- id = 127320
+- parent_id = 127320
 - 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 1cdc2032e7..5e6bee9359 100644
--- a/datasets/GM0177_raalte/graph_values.yml
+++ b/datasets/GM0177_raalte/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.215731429
+  max_demand: 215.73143
 energy_production_oily_biomass:
-  max_demand: 0.02279029
+  max_demand: 22.79029
 energy_production_wet_biomass:
-  max_demand: 0.467947441
+  max_demand: 467.94744
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad b/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad
index 1408c52eeb..566c8ddf3c 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 = 126903
-- parent_id = 126903
+- id = 127352
+- parent_id = 127352
 - 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 e52c591ea0..129b458899 100644
--- a/datasets/GM0180_staphorst/graph_values.yml
+++ b/datasets/GM0180_staphorst/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.12466831
+  max_demand: 124.66831
 energy_production_oily_biomass:
-  max_demand: 0.010330391
+  max_demand: 10.33039
 energy_production_wet_biomass:
-  max_demand: 0.272611777
+  max_demand: 272.61178
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad b/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad
index 6d7fc2618d..d798489652 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 = 126917
-- parent_id = 126917
+- id = 127366
+- parent_id = 127366
 - 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 e497cc36c8..659f859cc2 100644
--- a/datasets/GM0183_tubbergen/graph_values.yml
+++ b/datasets/GM0183_tubbergen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.162546857
+  max_demand: 162.54686
 energy_production_oily_biomass:
-  max_demand: 0.012926507
+  max_demand: 12.92651
 energy_production_wet_biomass:
-  max_demand: 0.358344147
+  max_demand: 358.34415
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0184_urk/GM0184_urk.derived.ad b/datasets/GM0184_urk/GM0184_urk.derived.ad
index c593931736..a191a3e2ea 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 = 126923
-- parent_id = 126923
+- id = 127372
+- parent_id = 127372
 - 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 7669961100..0353133c3b 100644
--- a/datasets/GM0184_urk/graph_values.yml
+++ b/datasets/GM0184_urk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.102318055
+  max_demand: 102.31806
 energy_production_oily_biomass:
-  max_demand: 0.012614827
+  max_demand: 12.61483
 energy_production_wet_biomass:
-  max_demand: 0.075763154
+  max_demand: 75.76315
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0189_wierden/GM0189_wierden.derived.ad b/datasets/GM0189_wierden/GM0189_wierden.derived.ad
index 77de5fa95b..b109e8b288 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 = 126955
-- parent_id = 126955
+- id = 127404
+- parent_id = 127404
 - 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 10c41a0a25..b5a49235c6 100644
--- a/datasets/GM0189_wierden/graph_values.yml
+++ b/datasets/GM0189_wierden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.125856489
+  max_demand: 125.85649
 energy_production_oily_biomass:
-  max_demand: 0.014794763
+  max_demand: 14.79476
 energy_production_wet_biomass:
-  max_demand: 0.234430538
+  max_demand: 234.43054
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad b/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad
index 010fa05252..3875d7ca19 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 = 126977
-- parent_id = 126977
+- id = 127426
+- parent_id = 127426
 - 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 162e106bf4..33b8ef239d 100644
--- a/datasets/GM0193_zwolle/graph_values.yml
+++ b/datasets/GM0193_zwolle/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.357320329
+  max_demand: 357.32033
 energy_production_oily_biomass:
-  max_demand: 0.077462439
+  max_demand: 77.46244
 energy_production_wet_biomass:
-  max_demand: 0.383969406
+  max_demand: 383.96941
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0197_aalten/GM0197_aalten.derived.ad b/datasets/GM0197_aalten/GM0197_aalten.derived.ad
index ff247a92f4..53cc2a6b94 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 = 126656
-- parent_id = 126656
+- id = 127105
+- parent_id = 127105
 - 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 a4fb3f6825..f91be692e0 100644
--- a/datasets/GM0197_aalten/graph_values.yml
+++ b/datasets/GM0197_aalten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.117792762
+  max_demand: 117.79276
 energy_production_oily_biomass:
-  max_demand: 0.01641088
+  max_demand: 16.41088
 energy_production_wet_biomass:
-  max_demand: 0.246520725
+  max_demand: 246.52073
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad b/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad
index c61354c18d..91fc1560d5 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 = 126669
-- parent_id = 126669
+- id = 127118
+- parent_id = 127118
 - 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 d606bb4565..69b8f97551 100644
--- a/datasets/GM0200_apeldoorn/graph_values.yml
+++ b/datasets/GM0200_apeldoorn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.609853198
+  max_demand: 609.8532
 energy_production_oily_biomass:
-  max_demand: 0.098695545
+  max_demand: 98.69555
 energy_production_wet_biomass:
-  max_demand: 0.533224598
+  max_demand: 533.2246
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad b/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad
index e6124f9edc..e64186b6ab 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 = 126670
-- parent_id = 126670
+- id = 127119
+- parent_id = 127119
 - 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 e342bb4902..fe5c5e62ff 100644
--- a/datasets/GM0202_arnhem/graph_values.yml
+++ b/datasets/GM0202_arnhem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.460656596
+  max_demand: 460.6566
 energy_production_oily_biomass:
-  max_demand: 0.096763495
+  max_demand: 96.7635
 energy_production_wet_biomass:
-  max_demand: 0.33621995
+  max_demand: 336.21995
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad b/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad
index facd5e397c..ef7e2ba3aa 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 = 126676
-- parent_id = 126676
+- id = 127125
+- parent_id = 127125
 - 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 c435c534e6..fae3409c67 100644
--- a/datasets/GM0203_barneveld/graph_values.yml
+++ b/datasets/GM0203_barneveld/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.463399497
+  max_demand: 463.3995
 energy_production_oily_biomass:
-  max_demand: 0.035221025
+  max_demand: 35.22103
 energy_production_wet_biomass:
-  max_demand: 0.330408501
+  max_demand: 330.4085
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad b/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad
index a05ffaece2..25cba7044e 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 = 126687
-- parent_id = 126687
+- id = 127136
+- parent_id = 127136
 - 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 9000ab5bb9..4081eab2bf 100644
--- a/datasets/GM0209_beuningen/graph_values.yml
+++ b/datasets/GM0209_beuningen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.083252581
+  max_demand: 83.25258
 energy_production_oily_biomass:
-  max_demand: 0.015724941
+  max_demand: 15.72494
 energy_production_wet_biomass:
-  max_demand: 0.099404342
+  max_demand: 99.40434
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0213_brummen/GM0213_brummen.derived.ad b/datasets/GM0213_brummen/GM0213_brummen.derived.ad
index 921527eea2..22ba8f3ddc 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 = 126700
-- parent_id = 126700
+- id = 127149
+- parent_id = 127149
 - 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 39e0df3218..78f9603f1f 100644
--- a/datasets/GM0213_brummen/graph_values.yml
+++ b/datasets/GM0213_brummen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.082156204
+  max_demand: 82.1562
 energy_production_oily_biomass:
-  max_demand: 0.012575336
+  max_demand: 12.57534
 energy_production_wet_biomass:
-  max_demand: 0.146415476
+  max_demand: 146.41548
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0214_buren/GM0214_buren.derived.ad b/datasets/GM0214_buren/GM0214_buren.derived.ad
index 4997950309..b1c06f8742 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 = 126704
-- parent_id = 126704
+- id = 127153
+- parent_id = 127153
 - 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 e7626bd6db..27927da23a 100644
--- a/datasets/GM0214_buren/graph_values.yml
+++ b/datasets/GM0214_buren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.109254342
+  max_demand: 109.25434
 energy_production_oily_biomass:
-  max_demand: 0.016141729
+  max_demand: 16.14173
 energy_production_wet_biomass:
-  max_demand: 0.253289385
+  max_demand: 253.28939
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad b/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad
index a2321560ee..e84f46f16a 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 = 126709
-- parent_id = 126709
+- id = 127158
+- parent_id = 127158
 - 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 8c8b6c38b7..86290cc5b5 100644
--- a/datasets/GM0216_culemborg/graph_values.yml
+++ b/datasets/GM0216_culemborg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.081321026
+  max_demand: 81.32103
 energy_production_oily_biomass:
-  max_demand: 0.017348957
+  max_demand: 17.34896
 energy_production_wet_biomass:
-  max_demand: 0.085904843
+  max_demand: 85.90484
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad b/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad
index 6c3f27fa77..ddad294b5e 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 = 126723
-- parent_id = 126723
+- id = 127172
+- parent_id = 127172
 - 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 f35b5c9659..ac33b55b1f 100644
--- a/datasets/GM0221_doesburg/graph_values.yml
+++ b/datasets/GM0221_doesburg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.032357929
+  max_demand: 32.35793
 energy_production_oily_biomass:
-  max_demand: 0.006773111
+  max_demand: 6.77311
 energy_production_wet_biomass:
-  max_demand: 0.041844985
+  max_demand: 41.84499
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad b/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad
index 52f0c3f9bb..54bf85a450 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 = 126724
-- parent_id = 126724
+- id = 127173
+- parent_id = 127173
 - 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 4f6625f4a6..f309e369f1 100644
--- a/datasets/GM0222_doetinchem/graph_values.yml
+++ b/datasets/GM0222_doetinchem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.193408297
+  max_demand: 193.4083
 energy_production_oily_biomass:
-  max_demand: 0.034968279
+  max_demand: 34.96828
 energy_production_wet_biomass:
-  max_demand: 0.224822667
+  max_demand: 224.82267
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0225_druten/GM0225_druten.derived.ad b/datasets/GM0225_druten/GM0225_druten.derived.ad
index 59873a6243..55fc3f7e45 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 = 126730
-- parent_id = 126730
+- id = 127179
+- parent_id = 127179
 - 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 ee1df1169a..19576c81d5 100644
--- a/datasets/GM0225_druten/graph_values.yml
+++ b/datasets/GM0225_druten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.064544694
+  max_demand: 64.54469
 energy_production_oily_biomass:
-  max_demand: 0.011420359
+  max_demand: 11.42036
 energy_production_wet_biomass:
-  max_demand: 0.119652481
+  max_demand: 119.65248
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0226_duiven/GM0226_duiven.derived.ad b/datasets/GM0226_duiven/GM0226_duiven.derived.ad
index 112c973321..7b95436627 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 = 126731
-- parent_id = 126731
+- id = 127180
+- parent_id = 127180
 - 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 ea74351647..44d7cdad9c 100644
--- a/datasets/GM0226_duiven/graph_values.yml
+++ b/datasets/GM0226_duiven/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.075408715
+  max_demand: 75.40872
 energy_production_oily_biomass:
-  max_demand: 0.015390782
+  max_demand: 15.39078
 energy_production_wet_biomass:
-  max_demand: 0.0752663
+  max_demand: 75.2663
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0228_ede/GM0228_ede.derived.ad b/datasets/GM0228_ede/GM0228_ede.derived.ad
index adaa099be1..40d7f7fdca 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 = 126734
-- parent_id = 126734
+- id = 127183
+- parent_id = 127183
 - 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 208e8237d9..f7bfed00fe 100644
--- a/datasets/GM0228_ede/graph_values.yml
+++ b/datasets/GM0228_ede/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.659341561
+  max_demand: 659.34156
 energy_production_oily_biomass:
-  max_demand: 0.070301096
+  max_demand: 70.3011
 energy_production_wet_biomass:
-  max_demand: 0.514019098
+  max_demand: 514.0191
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0230_elburg/GM0230_elburg.derived.ad b/datasets/GM0230_elburg/GM0230_elburg.derived.ad
index db4f6faa22..8426eb2a96 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 = 126739
-- parent_id = 126739
+- id = 127188
+- parent_id = 127188
 - 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 03fcc93c66..df7f62189b 100644
--- a/datasets/GM0230_elburg/graph_values.yml
+++ b/datasets/GM0230_elburg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.086079864
+  max_demand: 86.07986
 energy_production_oily_biomass:
-  max_demand: 0.014026196
+  max_demand: 14.0262
 energy_production_wet_biomass:
-  max_demand: 0.098845995
+  max_demand: 98.846
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0232_epe/GM0232_epe.derived.ad b/datasets/GM0232_epe/GM0232_epe.derived.ad
index 12fa1aea23..6022e41e42 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 = 126743
-- parent_id = 126743
+- id = 127192
+- parent_id = 127192
 - 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 6c27a463ca..cbefedb346 100644
--- a/datasets/GM0232_epe/graph_values.yml
+++ b/datasets/GM0232_epe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.19227472
+  max_demand: 192.27472
 energy_production_oily_biomass:
-  max_demand: 0.02013767
+  max_demand: 20.13767
 energy_production_wet_biomass:
-  max_demand: 0.207689358
+  max_demand: 207.68936
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad b/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad
index 8d61b74fda..8d82463a98 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 = 126744
-- parent_id = 126744
+- id = 127193
+- parent_id = 127193
 - 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 ea1677d49e..0ee2dd2dfa 100644
--- a/datasets/GM0233_ermelo/graph_values.yml
+++ b/datasets/GM0233_ermelo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.114719081
+  max_demand: 114.71908
 energy_production_oily_biomass:
-  max_demand: 0.016317923
+  max_demand: 16.31792
 energy_production_wet_biomass:
-  max_demand: 0.108418483
+  max_demand: 108.41848
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad b/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad
index 3d31ba2c7b..f7899ec367 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 = 126764
-- parent_id = 126764
+- id = 127213
+- parent_id = 127213
 - 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 928273b371..3210490cc2 100644
--- a/datasets/GM0243_harderwijk/graph_values.yml
+++ b/datasets/GM0243_harderwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.136117135
+  max_demand: 136.11714
 energy_production_oily_biomass:
-  max_demand: 0.028908447
+  max_demand: 28.90845
 energy_production_wet_biomass:
-  max_demand: 0.095394836
+  max_demand: 95.39484
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0244_hattem/GM0244_hattem.derived.ad b/datasets/GM0244_hattem/GM0244_hattem.derived.ad
index 0df61b87c3..7fa8d68ba4 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 = 126767
-- parent_id = 126767
+- id = 127216
+- parent_id = 127216
 - 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 5fe12be5b4..212a119970 100644
--- a/datasets/GM0244_hattem/graph_values.yml
+++ b/datasets/GM0244_hattem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.037899229
+  max_demand: 37.89923
 energy_production_oily_biomass:
-  max_demand: 0.007395862
+  max_demand: 7.39586
 energy_production_wet_biomass:
-  max_demand: 0.047496669
+  max_demand: 47.49667
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0246_heerde/GM0246_heerde.derived.ad b/datasets/GM0246_heerde/GM0246_heerde.derived.ad
index 47bf90e0a6..2231430a26 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 = 126770
-- parent_id = 126770
+- id = 127219
+- parent_id = 127219
 - 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 781a2e0760..f0d8059ae2 100644
--- a/datasets/GM0246_heerde/graph_values.yml
+++ b/datasets/GM0246_heerde/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.083847732
+  max_demand: 83.84773
 energy_production_oily_biomass:
-  max_demand: 0.01126786
+  max_demand: 11.26786
 energy_production_wet_biomass:
-  max_demand: 0.117206743
+  max_demand: 117.20674
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0252_heumen/GM0252_heumen.derived.ad b/datasets/GM0252_heumen/GM0252_heumen.derived.ad
index e3d5690e1f..1c0ea9c21e 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 = 126779
-- parent_id = 126779
+- id = 127228
+- parent_id = 127228
 - 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 3a679136bd..24b661fcf7 100644
--- a/datasets/GM0252_heumen/graph_values.yml
+++ b/datasets/GM0252_heumen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.057017617
+  max_demand: 57.01762
 energy_production_oily_biomass:
-  max_demand: 0.010016281
+  max_demand: 10.01628
 energy_production_wet_biomass:
-  max_demand: 0.086056422
+  max_demand: 86.05642
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0262_lochem/GM0262_lochem.derived.ad b/datasets/GM0262_lochem/GM0262_lochem.derived.ad
index 7d7f2c464d..d749e3cd4a 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 = 126815
-- parent_id = 126815
+- id = 127264
+- parent_id = 127264
 - 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 b40594e506..b0cc33f842 100644
--- a/datasets/GM0262_lochem/graph_values.yml
+++ b/datasets/GM0262_lochem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.200508868
+  max_demand: 200.50887
 energy_production_oily_biomass:
-  max_demand: 0.020408036
+  max_demand: 20.40804
 energy_production_wet_biomass:
-  max_demand: 0.407650228
+  max_demand: 407.65023
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad b/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad
index d33615d02a..8a08fd9b47 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 = 126819
-- parent_id = 126819
+- id = 127268
+- parent_id = 127268
 - 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 1d13080977..0afd5f71e9 100644
--- a/datasets/GM0263_maasdriel/graph_values.yml
+++ b/datasets/GM0263_maasdriel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.076861762
+  max_demand: 76.86176
 energy_production_oily_biomass:
-  max_demand: 0.015002549
+  max_demand: 15.00255
 energy_production_wet_biomass:
-  max_demand: 0.166064974
+  max_demand: 166.06497
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad b/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad
index fb263a244d..072d1f338d 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 = 126837
-- parent_id = 126837
+- id = 127286
+- parent_id = 127286
 - 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 f9963e67e4..98e8d2631f 100644
--- a/datasets/GM0267_nijkerk/graph_values.yml
+++ b/datasets/GM0267_nijkerk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.191287916
+  max_demand: 191.28792
 energy_production_oily_biomass:
-  max_demand: 0.026090571
+  max_demand: 26.09057
 energy_production_wet_biomass:
-  max_demand: 0.169107293
+  max_demand: 169.10729
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad b/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad
index b7951ec23b..254b83e552 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 = 126838
-- parent_id = 126838
+- id = 127287
+- parent_id = 127287
 - 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 acdeb50bce..977f062b2c 100644
--- a/datasets/GM0268_nijmegen/graph_values.yml
+++ b/datasets/GM0268_nijmegen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.4620867
+  max_demand: 462.0867
 energy_production_oily_biomass:
-  max_demand: 0.107390377
+  max_demand: 107.39038
 energy_production_wet_biomass:
-  max_demand: 0.310087
+  max_demand: 310.087
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad b/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad
index 6614ccf025..4d2deef462 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 = 126850
-- parent_id = 126850
+- id = 127299
+- parent_id = 127299
 - 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 8d9d94626c..95242df528 100644
--- a/datasets/GM0269_oldebroek/graph_values.yml
+++ b/datasets/GM0269_oldebroek/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.097763082
+  max_demand: 97.76308
 energy_production_oily_biomass:
-  max_demand: 0.014337268
+  max_demand: 14.33727
 energy_production_wet_biomass:
-  max_demand: 0.148138604
+  max_demand: 148.1386
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0273_putten/GM0273_putten.derived.ad b/datasets/GM0273_putten/GM0273_putten.derived.ad
index d6cf76a603..6dbbbb04ba 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 = 126870
-- parent_id = 126870
+- id = 127319
+- parent_id = 127319
 - 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 323c1cb35d..10c3783205 100644
--- a/datasets/GM0273_putten/graph_values.yml
+++ b/datasets/GM0273_putten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.153954028
+  max_demand: 153.95403
 energy_production_oily_biomass:
-  max_demand: 0.014701806
+  max_demand: 14.70181
 energy_production_wet_biomass:
-  max_demand: 0.157945134
+  max_demand: 157.94513
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0274_renkum/GM0274_renkum.derived.ad b/datasets/GM0274_renkum/GM0274_renkum.derived.ad
index 2e2fb942dd..c7b547b915 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 = 126873
-- parent_id = 126873
+- id = 127322
+- parent_id = 127322
 - 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 5b7d2af1e8..2f798ec816 100644
--- a/datasets/GM0274_renkum/graph_values.yml
+++ b/datasets/GM0274_renkum/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.098902071
+  max_demand: 98.90207
 energy_production_oily_biomass:
-  max_demand: 0.019017932
+  max_demand: 19.01793
 energy_production_wet_biomass:
-  max_demand: 0.080297641
+  max_demand: 80.29764
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0275_rheden/GM0275_rheden.derived.ad b/datasets/GM0275_rheden/GM0275_rheden.derived.ad
index 52a2d181ff..3fda62775f 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 = 126876
-- parent_id = 126876
+- id = 127325
+- parent_id = 127325
 - 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 82ae1d68c4..00ef14b025 100644
--- a/datasets/GM0275_rheden/graph_values.yml
+++ b/datasets/GM0275_rheden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.151263357
+  max_demand: 151.26336
 energy_production_oily_biomass:
-  max_demand: 0.026514042
+  max_demand: 26.51404
 energy_production_wet_biomass:
-  max_demand: 0.158397334
+  max_demand: 158.39733
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad b/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad
index eee795de06..b21bcd562e 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 = 126885
-- parent_id = 126885
+- id = 127334
+- parent_id = 127334
 - 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 b313e9be3d..7103217444 100644
--- a/datasets/GM0277_rozendaal/graph_values.yml
+++ b/datasets/GM0277_rozendaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.022920241
+  max_demand: 22.92024
 energy_production_oily_biomass:
-  max_demand: 0.001004909
+  max_demand: 1.00491
 energy_production_wet_biomass:
-  max_demand: 0.01951638
+  max_demand: 19.51638
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad b/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad
index 9d510ceb2f..cebd549d65 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 = 126888
-- parent_id = 126888
+- id = 127337
+- parent_id = 127337
 - 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 fe8cbdf93d..9d7bad4609 100644
--- a/datasets/GM0279_scherpenzeel/graph_values.yml
+++ b/datasets/GM0279_scherpenzeel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.068900424
+  max_demand: 68.90042
 energy_production_oily_biomass:
-  max_demand: 0.005998468
+  max_demand: 5.99847
 energy_production_wet_biomass:
-  max_demand: 0.036142904
+  max_demand: 36.1429
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0281_tiel/GM0281_tiel.derived.ad b/datasets/GM0281_tiel/GM0281_tiel.derived.ad
index 4d9c4be0b9..cee349ba36 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 = 126915
-- parent_id = 126915
+- id = 127364
+- parent_id = 127364
 - 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 3fb5021b3a..5d0f2f66c5 100644
--- a/datasets/GM0281_tiel/graph_values.yml
+++ b/datasets/GM0281_tiel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.116928934
+  max_demand: 116.92893
 energy_production_oily_biomass:
-  max_demand: 0.025504273
+  max_demand: 25.50427
 energy_production_wet_biomass:
-  max_demand: 0.109258867
+  max_demand: 109.25887
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0285_voorst/GM0285_voorst.derived.ad b/datasets/GM0285_voorst/GM0285_voorst.derived.ad
index 95b5fc99a6..b4bd3d841d 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 = 126941
-- parent_id = 126941
+- id = 127390
+- parent_id = 127390
 - 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 656223e3a0..27eb027739 100644
--- a/datasets/GM0285_voorst/graph_values.yml
+++ b/datasets/GM0285_voorst/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.114665241
+  max_demand: 114.66524
 energy_production_oily_biomass:
-  max_demand: 0.014834862
+  max_demand: 14.83486
 energy_production_wet_biomass:
-  max_demand: 0.26126547
+  max_demand: 261.26547
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad b/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad
index 405c5e0b10..8401c34d65 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 = 126946
-- parent_id = 126946
+- id = 127395
+- parent_id = 127395
 - 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 2e61c7142d..8426468691 100644
--- a/datasets/GM0289_wageningen/graph_values.yml
+++ b/datasets/GM0289_wageningen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.109662579
+  max_demand: 109.66258
 energy_production_oily_biomass:
-  max_demand: 0.023557641
+  max_demand: 23.55764
 energy_production_wet_biomass:
-  max_demand: 0.090706338
+  max_demand: 90.70634
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad b/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad
index c537b492ed..92e32f329d 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 = 126952
-- parent_id = 126952
+- id = 127401
+- parent_id = 127401
 - 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 7900a423c7..3cedb5719e 100644
--- a/datasets/GM0293_westervoort/graph_values.yml
+++ b/datasets/GM0293_westervoort/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.038970671
+  max_demand: 38.97067
 energy_production_oily_biomass:
-  max_demand: 0.009079419
+  max_demand: 9.07942
 energy_production_wet_biomass:
-  max_demand: 0.02856212
+  max_demand: 28.56212
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad b/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad
index df2834e9de..4cf867e273 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 = 126959
-- parent_id = 126959
+- id = 127408
+- parent_id = 127408
 - 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 88e411d15f..f826c81dc0 100644
--- a/datasets/GM0294_winterswijk/graph_values.yml
+++ b/datasets/GM0294_winterswijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.13127805
+  max_demand: 131.27805
 energy_production_oily_biomass:
-  max_demand: 0.017560389
+  max_demand: 17.56039
 energy_production_wet_biomass:
-  max_demand: 0.251653786
+  max_demand: 251.65379
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad b/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad
index 92367ae750..a742b5e3b5 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 = 126956
-- parent_id = 126956
+- id = 127405
+- parent_id = 127405
 - 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 2215a2b209..c75af7de9d 100644
--- a/datasets/GM0296_wijchen/graph_values.yml
+++ b/datasets/GM0296_wijchen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.128849688
+  max_demand: 128.84969
 energy_production_oily_biomass:
-  max_demand: 0.024880306
+  max_demand: 24.88031
 energy_production_wet_biomass:
-  max_demand: 0.190682114
+  max_demand: 190.68211
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad b/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad
index a72bc2dc0c..cbe1b146ee 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 = 126965
-- parent_id = 126965
+- id = 127414
+- parent_id = 127414
 - 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 813c2b5af5..1c5600f421 100644
--- a/datasets/GM0297_zaltbommel/graph_values.yml
+++ b/datasets/GM0297_zaltbommel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.10976381
+  max_demand: 109.76381
 energy_production_oily_biomass:
-  max_demand: 0.01728577
+  max_demand: 17.28577
 energy_production_wet_biomass:
-  max_demand: 0.192271776
+  max_demand: 192.27178
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad b/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad
index 74583c2539..4f4c4767e5 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 = 126969
-- parent_id = 126969
+- id = 127418
+- parent_id = 127418
 - 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 c920cf23fb..616ab08af2 100644
--- a/datasets/GM0299_zevenaar/graph_values.yml
+++ b/datasets/GM0299_zevenaar/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.137924571
+  max_demand: 137.92457
 energy_production_oily_biomass:
-  max_demand: 0.026421693
+  max_demand: 26.42169
 energy_production_wet_biomass:
-  max_demand: 0.235904421
+  max_demand: 235.90442
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad b/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad
index 112988c633..5a0c901513 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 = 126974
-- parent_id = 126974
+- id = 127423
+- parent_id = 127423
 - 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 4e60dd9c26..70f4423749 100644
--- a/datasets/GM0301_zutphen/graph_values.yml
+++ b/datasets/GM0301_zutphen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.139128828
+  max_demand: 139.12883
 energy_production_oily_biomass:
-  max_demand: 0.028925459
+  max_demand: 28.92546
 energy_production_wet_biomass:
-  max_demand: 0.132724937
+  max_demand: 132.72494
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad b/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad
index c0c1749dea..6173918da8 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 = 126845
-- parent_id = 126845
+- id = 127294
+- parent_id = 127294
 - 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 4b8b509af3..4217515500 100644
--- a/datasets/GM0302_nunspeet/graph_values.yml
+++ b/datasets/GM0302_nunspeet/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.140042773
+  max_demand: 140.04277
 energy_production_oily_biomass:
-  max_demand: 0.016696434
+  max_demand: 16.69643
 energy_production_wet_biomass:
-  max_demand: 0.1456215
+  max_demand: 145.6215
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0303_dronten/GM0303_dronten.derived.ad b/datasets/GM0303_dronten/GM0303_dronten.derived.ad
index 29ba5c30a8..10eebd34bf 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 = 126729
-- parent_id = 126729
+- id = 127178
+- parent_id = 127178
 - 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 23429f8503..80972e67f4 100644
--- a/datasets/GM0303_dronten/graph_values.yml
+++ b/datasets/GM0303_dronten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.303691201
+  max_demand: 303.6912
 energy_production_oily_biomass:
-  max_demand: 0.024797677
+  max_demand: 24.79768
 energy_production_wet_biomass:
-  max_demand: 1.411988003
+  max_demand: 1411.988
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad b/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad
index e46327f2da..6355210ba3 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 = 126666
-- parent_id = 126666
+- id = 127115
+- parent_id = 127115
 - 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 017124dc84..f5dad0301a 100644
--- a/datasets/GM0307_amersfoort/graph_values.yml
+++ b/datasets/GM0307_amersfoort/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.412153354
+  max_demand: 412.15335
 energy_production_oily_biomass:
-  max_demand: 0.094953566
+  max_demand: 94.95357
 energy_production_wet_biomass:
-  max_demand: 0.301800759
+  max_demand: 301.80076
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0308_baarn/GM0308_baarn.derived.ad b/datasets/GM0308_baarn/GM0308_baarn.derived.ad
index adcc056e6a..7deba19633 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 = 126674
-- parent_id = 126674
+- id = 127123
+- parent_id = 127123
 - 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 3353af1a1e..f6c4aae0fa 100644
--- a/datasets/GM0308_baarn/graph_values.yml
+++ b/datasets/GM0308_baarn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.081635357
+  max_demand: 81.63536
 energy_production_oily_biomass:
-  max_demand: 0.015047509
+  max_demand: 15.04751
 energy_production_wet_biomass:
-  max_demand: 0.072502328
+  max_demand: 72.50233
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad b/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad
index 073adafdb5..24158db650 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 = 126712
-- parent_id = 126712
+- id = 127161
+- parent_id = 127161
 - 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 e55c44c497..08d92f407d 100644
--- a/datasets/GM0310_de_bilt/graph_values.yml
+++ b/datasets/GM0310_de_bilt/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.138087969
+  max_demand: 138.08797
 energy_production_oily_biomass:
-  max_demand: 0.026018271
+  max_demand: 26.01827
 energy_production_wet_biomass:
-  max_demand: 0.147493279
+  max_demand: 147.49328
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad b/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad
index 27adfcc4af..b74b7edd49 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 = 126702
-- parent_id = 126702
+- id = 127151
+- parent_id = 127151
 - 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 02a875af43..10b8d3fc43 100644
--- a/datasets/GM0312_bunnik/graph_values.yml
+++ b/datasets/GM0312_bunnik/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.051672101
+  max_demand: 51.6721
 energy_production_oily_biomass:
-  max_demand: 0.009230095
+  max_demand: 9.2301
 energy_production_wet_biomass:
-  max_demand: 0.092314968
+  max_demand: 92.31497
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad b/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad
index 35213763a9..bb25f427e6 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 = 126703
-- parent_id = 126703
+- id = 127152
+- parent_id = 127152
 - 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 6368be47dd..1025c2cfd1 100644
--- a/datasets/GM0313_bunschoten/graph_values.yml
+++ b/datasets/GM0313_bunschoten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.061420414
+  max_demand: 61.42041
 energy_production_oily_biomass:
-  max_demand: 0.013108776
+  max_demand: 13.10878
 energy_production_wet_biomass:
-  max_demand: 0.096149907
+  max_demand: 96.14991
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad b/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad
index e45fd2de08..dfca2a1ae0 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 = 126735
-- parent_id = 126735
+- id = 127184
+- parent_id = 127184
 - 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 2e1da141b4..3f14755408 100644
--- a/datasets/GM0317_eemnes/graph_values.yml
+++ b/datasets/GM0317_eemnes/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.029115339
+  max_demand: 29.11534
 energy_production_oily_biomass:
-  max_demand: 0.00553672
+  max_demand: 5.53672
 energy_production_wet_biomass:
-  max_demand: 0.04835138
+  max_demand: 48.35138
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0321_houten/GM0321_houten.derived.ad b/datasets/GM0321_houten/GM0321_houten.derived.ad
index cca9179ad3..91c9b6afbf 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 = 126789
-- parent_id = 126789
+- id = 127238
+- parent_id = 127238
 - 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 631d788da5..4c2b4f2d36 100644
--- a/datasets/GM0321_houten/graph_values.yml
+++ b/datasets/GM0321_houten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.149558349
+  max_demand: 149.55835
 energy_production_oily_biomass:
-  max_demand: 0.030324069
+  max_demand: 30.32407
 energy_production_wet_biomass:
-  max_demand: 0.177225542
+  max_demand: 177.22554
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0327_leusden/GM0327_leusden.derived.ad b/datasets/GM0327_leusden/GM0327_leusden.derived.ad
index c2a3615631..cfe3984d12 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 = 126812
-- parent_id = 126812
+- id = 127261
+- parent_id = 127261
 - 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 f37f81ab43..006c4083c3 100644
--- a/datasets/GM0327_leusden/graph_values.yml
+++ b/datasets/GM0327_leusden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.104097608
+  max_demand: 104.09761
 energy_production_oily_biomass:
-  max_demand: 0.018245112
+  max_demand: 18.24511
 energy_production_wet_biomass:
-  max_demand: 0.117093284
+  max_demand: 117.09328
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0331_lopik/GM0331_lopik.derived.ad b/datasets/GM0331_lopik/GM0331_lopik.derived.ad
index 2d2eb56d1f..ff479a5902 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 = 126817
-- parent_id = 126817
+- id = 127266
+- parent_id = 127266
 - 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 81bd77b4e3..5a68d596ab 100644
--- a/datasets/GM0331_lopik/graph_values.yml
+++ b/datasets/GM0331_lopik/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.067554153
+  max_demand: 67.55415
 energy_production_oily_biomass:
-  max_demand: 0.008793257
+  max_demand: 8.79326
 energy_production_wet_biomass:
-  max_demand: 0.177147431
+  max_demand: 177.14743
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad b/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad
index 664f15571e..79f9198aa7 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 = 126831
-- parent_id = 126831
+- id = 127280
+- parent_id = 127280
 - 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 1286a7256f..d136652fba 100644
--- a/datasets/GM0335_montfoort/graph_values.yml
+++ b/datasets/GM0335_montfoort/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.045522023
+  max_demand: 45.52202
 energy_production_oily_biomass:
-  max_demand: 0.008503449
+  max_demand: 8.50345
 energy_production_wet_biomass:
-  max_demand: 0.118778628
+  max_demand: 118.77863
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad b/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad
index 78b195e663..a29b5cf541 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 = 126874
-- parent_id = 126874
+- id = 127323
+- parent_id = 127323
 - 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 eb34b45694..229c339a28 100644
--- a/datasets/GM0339_renswoude/graph_values.yml
+++ b/datasets/GM0339_renswoude/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.072506991
+  max_demand: 72.50699
 energy_production_oily_biomass:
-  max_demand: 0.003195173
+  max_demand: 3.19517
 energy_production_wet_biomass:
-  max_demand: 0.054023223
+  max_demand: 54.02322
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad b/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad
index 1e5f97e086..d76b1a4203 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 = 126877
-- parent_id = 126877
+- id = 127326
+- parent_id = 127326
 - 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 39046781f2..250c6476fb 100644
--- a/datasets/GM0340_rhenen/graph_values.yml
+++ b/datasets/GM0340_rhenen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.075890671
+  max_demand: 75.89067
 energy_production_oily_biomass:
-  max_demand: 0.012153687
+  max_demand: 12.15369
 energy_production_wet_biomass:
-  max_demand: 0.090283153
+  max_demand: 90.28315
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0342_soest/GM0342_soest.derived.ad b/datasets/GM0342_soest/GM0342_soest.derived.ad
index e43597c9fc..8eedc67de0 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 = 126899
-- parent_id = 126899
+- id = 127348
+- parent_id = 127348
 - 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 9abf5d640b..21174e99b7 100644
--- a/datasets/GM0342_soest/graph_values.yml
+++ b/datasets/GM0342_soest/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.132428821
+  max_demand: 132.42882
 energy_production_oily_biomass:
-  max_demand: 0.028065758
+  max_demand: 28.06576
 energy_production_wet_biomass:
-  max_demand: 0.102871531
+  max_demand: 102.87153
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad b/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad
index 5281c49a0d..3cbda3e2be 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 = 126924
-- parent_id = 126924
+- id = 127373
+- parent_id = 127373
 - 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 5716cb8a39..b821d5a297 100644
--- a/datasets/GM0344_utrecht/graph_values.yml
+++ b/datasets/GM0344_utrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.901897626
+  max_demand: 901.89763
 energy_production_oily_biomass:
-  max_demand: 0.214388268
+  max_demand: 214.38827
 energy_production_wet_biomass:
-  max_demand: 0.631183803
+  max_demand: 631.1838
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad b/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad
index 882ef22e33..3d552e6285 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 = 126930
-- parent_id = 126930
+- id = 127379
+- parent_id = 127379
 - 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 1aa32d6f03..96b3eae8ab 100644
--- a/datasets/GM0345_veenendaal/graph_values.yml
+++ b/datasets/GM0345_veenendaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.16595123
+  max_demand: 165.95123
 energy_production_oily_biomass:
-  max_demand: 0.039849439
+  max_demand: 39.84944
 energy_production_wet_biomass:
-  max_demand: 0.113617964
+  max_demand: 113.61796
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad b/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad
index 753e535ea6..0f20f6dfdb 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 = 126963
-- parent_id = 126963
+- id = 127412
+- parent_id = 127412
 - 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 b6d654a765..0625be6e1c 100644
--- a/datasets/GM0351_woudenberg/graph_values.yml
+++ b/datasets/GM0351_woudenberg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.078550005
+  max_demand: 78.55001
 energy_production_oily_biomass:
-  max_demand: 0.007999172
+  max_demand: 7.99917
 energy_production_wet_biomass:
-  max_demand: 0.092237972
+  max_demand: 92.23797
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 09d0803b6b..a2568ea444 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 = 126958
-- parent_id = 126958
+- id = 127407
+- parent_id = 127407
 - 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 d058faabb9..b2da439435 100644
--- a/datasets/GM0352_wijk_bij_duurstede/graph_values.yml
+++ b/datasets/GM0352_wijk_bij_duurstede/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.079812653
+  max_demand: 79.81265
 energy_production_oily_biomass:
-  max_demand: 0.014436908
+  max_demand: 14.43691
 energy_production_wet_biomass:
-  max_demand: 0.125458521
+  max_demand: 125.45852
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad b/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad
index 75973470dd..8499b847e4 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 = 126792
-- parent_id = 126792
+- id = 127241
+- parent_id = 127241
 - 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 8a69a64024..f11d54482d 100644
--- a/datasets/GM0353_ijsselstein/graph_values.yml
+++ b/datasets/GM0353_ijsselstein/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.090055594
+  max_demand: 90.05559
 energy_production_oily_biomass:
-  max_demand: 0.020754347
+  max_demand: 20.75435
 energy_production_wet_biomass:
-  max_demand: 0.085100249
+  max_demand: 85.10025
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0355_zeist/GM0355_zeist.derived.ad b/datasets/GM0355_zeist/GM0355_zeist.derived.ad
index 8cc7d4e786..67612f7dd6 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 = 126968
-- parent_id = 126968
+- id = 127417
+- parent_id = 127417
 - 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 dc50c42c98..0a7bc14a6b 100644
--- a/datasets/GM0355_zeist/graph_values.yml
+++ b/datasets/GM0355_zeist/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.185267104
+  max_demand: 185.2671
 energy_production_oily_biomass:
-  max_demand: 0.038843922
+  max_demand: 38.84392
 energy_production_wet_biomass:
-  max_demand: 0.130340402
+  max_demand: 130.3404
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad b/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad
index 601ef12c4b..b7d2273586 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 = 126835
-- parent_id = 126835
+- id = 127284
+- parent_id = 127284
 - 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 cfda28aa34..69ea8c46e3 100644
--- a/datasets/GM0356_nieuwegein/graph_values.yml
+++ b/datasets/GM0356_nieuwegein/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.174682789
+  max_demand: 174.68279
 energy_production_oily_biomass:
-  max_demand: 0.038298331
+  max_demand: 38.29833
 energy_production_wet_biomass:
-  max_demand: 0.126728074
+  max_demand: 126.72807
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad b/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad
index b02f8e6e46..5affdcf4b3 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 = 126655
-- parent_id = 126655
+- id = 127104
+- parent_id = 127104
 - 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 3853f342ef..92e8293270 100644
--- a/datasets/GM0358_aalsmeer/graph_values.yml
+++ b/datasets/GM0358_aalsmeer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.083722821
+  max_demand: 83.72282
 energy_production_oily_biomass:
-  max_demand: 0.019276754
+  max_demand: 19.27675
 energy_production_wet_biomass:
-  max_demand: 0.192870071
+  max_demand: 192.87007
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad b/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad
index 997e9f7e09..6d18c81b45 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 = 126660
-- parent_id = 126660
+- id = 127109
+- parent_id = 127109
 - 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 befec6e650..5d5fa819f9 100644
--- a/datasets/GM0361_alkmaar/graph_values.yml
+++ b/datasets/GM0361_alkmaar/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.317042207
+  max_demand: 317.04221
 energy_production_oily_biomass:
-  max_demand: 0.065955807
+  max_demand: 65.95581
 energy_production_wet_biomass:
-  max_demand: 0.405458657
+  max_demand: 405.45866
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad b/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad
index b7a7de297e..aea6e62428 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 = 126667
-- parent_id = 126667
+- id = 127116
+- parent_id = 127116
 - 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 aabcbec267..1db7b1cb66 100644
--- a/datasets/GM0362_amstelveen/graph_values.yml
+++ b/datasets/GM0362_amstelveen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.24417787
+  max_demand: 244.17787
 energy_production_oily_biomass:
-  max_demand: 0.055189793
+  max_demand: 55.18979
 energy_production_wet_biomass:
-  max_demand: 0.199839884
+  max_demand: 199.83988
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad b/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad
index b164ea4a1f..4ab2b3c77a 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 = 126668
-- parent_id = 126668
+- id = 127117
+- parent_id = 127117
 - 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 be72d8e771..dfc2034c5c 100644
--- a/datasets/GM0363_amsterdam/graph_values.yml
+++ b/datasets/GM0363_amsterdam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 2.194338857
+  max_demand: 2194.33886
 energy_production_oily_biomass:
-  max_demand: 0.524305465
+  max_demand: 524.30547
 energy_production_wet_biomass:
-  max_demand: 1.726492962
+  max_demand: 1726.49296
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0370_beemster/GM0370_beemster.derived.ad b/datasets/GM0370_beemster/GM0370_beemster.derived.ad
new file mode 100644
index 0000000000..4f60653d43
--- /dev/null
+++ b/datasets/GM0370_beemster/GM0370_beemster.derived.ad
@@ -0,0 +1,211 @@
+- area = GM0370_beemster
+- id = 127101
+- parent_id = 127101
+- group = country
+- enabled.etengine = true
+- enabled.etmodel = true
+- analysis_year = 2019
+- has_agriculture = true
+- has_semi_detached_houses = true
+- has_coastline = true
+- has_industry = true
+- has_lignite = false
+- has_merit_order = true
+- has_mountains = false
+- has_solar_csp = false
+- has_offshore_solar = true
+- use_merit_order_demands = true
+- has_weather_curves = true
+- has_coal_oil_for_heating_built_environment = false
+- has_aquathermal_potential_for_surface_water = true
+- has_aquathermal_potential_for_waste_water = true
+- has_aquathermal_potential_for_drink_water = true
+- co2_emission_1990_aviation_bunkers = 4.6046
+- co2_emission_1990_marine_bunkers = 34.95619
+- co2_percentage_free = 0.4
+- co2_price = 0.02483
+- captured_biogenic_co2_price = 0.02483
+- offshore_ccs_potential_mt_per_year = 65.0
+- lv_net_spare_capacity = 0.25
+- lv_net_total_costs_present = 838847167.7
+- lv_net_costs_per_capacity_step = 183200.0
+- lv_net_capacity_per_step = 0.2
+- mv_net_spare_capacity = 0.25
+- mv_net_total_costs_present = 720884284.7
+- mv_net_costs_per_capacity_step = 1380000.0
+- mv_net_capacity_per_step = 2.0
+- hv_net_spare_capacity = 0.25
+- hv_net_total_costs_present = 423617819.7
+- hv_net_costs_per_capacity_step = 7280000.0
+- hv_net_capacity_per_step = 20.0
+- lv_mv_trafo_spare_capacity = 0.25
+- lv_mv_trafo_total_costs_present = 298839303.5
+- lv_mv_trafo_costs_per_capacity_step = 40000.0
+- lv_mv_trafo_capacity_per_step = 0.2
+- mv_hv_trafo_spare_capacity = 0.25
+- mv_hv_trafo_total_costs_present = 251654150.3
+- mv_hv_trafo_costs_per_capacity_step = 500000.0
+- mv_hv_trafo_capacity_per_step = 2.0
+- interconnection_net_costs_present = 139550090.5
+- offshore_net_costs_present = 26607183.6
+- flh_solar_pv_solar_radiation_max = 1361.35634547
+- hydrogen_electrolysis_solar_pv_capacity_ratio = 0.426770076
+- present_share_of_apartments_before_1945_in_useful_demand_for_space_heating = 0.0625040726869224
+- present_share_of_apartments_1945_1964_in_useful_demand_for_space_heating = 0.0474523564642453
+- present_share_of_apartments_1965_1984_in_useful_demand_for_space_heating = 0.0953994416233717
+- present_share_of_apartments_1985_2004_in_useful_demand_for_space_heating = 0.0770344579668123
+- present_share_of_apartments_2005_present_in_useful_demand_for_space_heating = 0.0612550022813887
+- present_share_of_detached_houses_before_1945_in_useful_demand_for_space_heating = 0.0370316563248165
+- present_share_of_detached_houses_1945_1964_in_useful_demand_for_space_heating = 0.0185715330739085
+- present_share_of_detached_houses_1965_1984_in_useful_demand_for_space_heating = 0.0297821990506175
+- present_share_of_detached_houses_1985_2004_in_useful_demand_for_space_heating = 0.0327032751808859
+- present_share_of_detached_houses_2005_present_in_useful_demand_for_space_heating = 0.0152188916593297
+- present_share_of_semi_detached_houses_before_1945_in_useful_demand_for_space_heating = 0.0387108078042949
+- present_share_of_semi_detached_houses_1945_1964_in_useful_demand_for_space_heating = 0.0383527943771621
+- present_share_of_semi_detached_houses_1965_1984_in_useful_demand_for_space_heating = 0.072780744915689
+- present_share_of_semi_detached_houses_1985_2004_in_useful_demand_for_space_heating = 0.048605443601013
+- present_share_of_semi_detached_houses_2005_present_in_useful_demand_for_space_heating = 0.0227994495913242
+- present_share_of_terraced_houses_before_1945_in_useful_demand_for_space_heating = 0.0425312979748771
+- present_share_of_terraced_houses_1945_1964_in_useful_demand_for_space_heating = 0.0394372730348244
+- present_share_of_terraced_houses_1965_1984_in_useful_demand_for_space_heating = 0.112216227322524
+- present_share_of_terraced_houses_1985_2004_in_useful_demand_for_space_heating = 0.0761178811197236
+- present_share_of_terraced_houses_2005_present_in_useful_demand_for_space_heating = 0.0314951939462689
+- typical_useful_demand_for_space_heating_apartments_before_1945 = 309.2785
+- typical_useful_demand_for_space_heating_apartments_1945_1964 = 225.7048
+- typical_useful_demand_for_space_heating_apartments_1965_1984 = 193.542
+- typical_useful_demand_for_space_heating_apartments_1985_2004 = 154.5946
+- typical_useful_demand_for_space_heating_apartments_2005_present = 115.9263
+- typical_useful_demand_for_space_heating_apartments_future = 65.0
+- typical_useful_demand_for_space_heating_detached_houses_before_1945 = 296.1239
+- typical_useful_demand_for_space_heating_detached_houses_1945_1964 = 243.2537
+- typical_useful_demand_for_space_heating_detached_houses_1965_1984 = 202.5222
+- typical_useful_demand_for_space_heating_detached_houses_1985_2004 = 160.3984
+- typical_useful_demand_for_space_heating_detached_houses_2005_present = 116.3707
+- typical_useful_demand_for_space_heating_detached_houses_future = 55.0
+- typical_useful_demand_for_space_heating_semi_detached_houses_before_1945 = 268.9665
+- typical_useful_demand_for_space_heating_semi_detached_houses_1945_1964 = 217.0396
+- typical_useful_demand_for_space_heating_semi_detached_houses_1965_1984 = 187.3579
+- typical_useful_demand_for_space_heating_semi_detached_houses_1985_2004 = 154.0974
+- typical_useful_demand_for_space_heating_semi_detached_houses_2005_present = 114.2388
+- typical_useful_demand_for_space_heating_semi_detached_houses_future = 55.0
+- typical_useful_demand_for_space_heating_terraced_houses_before_1945 = 305.0056
+- typical_useful_demand_for_space_heating_terraced_houses_1945_1964 = 280.6464
+- typical_useful_demand_for_space_heating_terraced_houses_1965_1984 = 217.9607
+- typical_useful_demand_for_space_heating_terraced_houses_1985_2004 = 150.8078
+- typical_useful_demand_for_space_heating_terraced_houses_2005_present = 116.2858
+- typical_useful_demand_for_space_heating_terraced_houses_future = 55.0
+- typical_useful_demand_for_space_heating_buildings_present = 243.571
+- typical_useful_demand_for_space_heating_buildings_future = 190.0
+- heat_share_of_apartments_with_block_heating = 0.154
+- heat_infrastructure_households_ht_indoor_investment_costs_apartments_with_block_heating_eur = 4069.0
+- heat_infrastructure_households_ht_indoor_investment_costs_apartments_without_block_heating_eur = 7372.0
+- heat_infrastructure_households_ht_indoor_investment_costs_ground_level_houses_eur = 10080.0
+- heat_exchanger_station_investment_costs_eur_per_kw = 133.0
+- heat_ht_sub_station_investment_costs_eur_per_kw = 50.0
+- heat_ht_distribution_pipelines_investment_costs_eur_per_meter = 1416.0
+- heat_ht_primary_pipelines_investment_costs_per_kw = 216.0
+- heat_infrastructure_households_mt_indoor_investment_costs_apartments_with_block_heating_eur = 4069.0
+- heat_infrastructure_households_mt_indoor_investment_costs_apartments_without_block_heating_eur = 7372.0
+- heat_infrastructure_households_mt_indoor_investment_costs_ground_level_houses_eur = 10080.0
+- heat_mt_sub_station_investment_costs_eur_per_kw = 50.0
+- heat_mt_distribution_pipelines_investment_costs_eur_per_meter = 1818.0
+- heat_mt_primary_pipelines_investment_costs_per_kw = 245.0
+- heat_infrastructure_households_lt_indoor_investment_costs_apartments_with_block_heating_eur = 4069.0
+- heat_infrastructure_households_lt_indoor_investment_costs_apartments_without_block_heating_eur = 7372.0
+- heat_infrastructure_households_lt_indoor_investment_costs_ground_level_houses_eur = 10080.0
+- heat_lt_sub_station_investment_costs_eur_per_kw = 100.0
+- heat_lt_distribution_pipelines_investment_costs_eur_per_meter = 2046.0
+- heat_lt_primary_pipelines_investment_costs_per_kw = 245.0
+- heat_length_of_distribution_pipelines_in_meter_per_residence_object_first_bracket = 3.2
+- heat_length_of_distribution_pipelines_in_meter_per_residence_object_second_bracket = 4.6
+- heat_length_of_distribution_pipelines_in_meter_per_residence_object_third_bracket = 5.8
+- heat_length_of_distribution_pipelines_in_meter_per_residence_object_fourth_bracket = 7.0
+- heat_length_of_distribution_pipelines_in_meter_per_residence_object_fifth_bracket = 10.0
+- heat_length_of_connection_pipelines_in_meter_per_residence_first_bracket = 1.7
+- heat_length_of_connection_pipelines_in_meter_per_residence_second_bracket = 3.5
+- heat_length_of_connection_pipelines_in_meter_per_residence_third_bracket = 5.0
+- heat_length_of_connection_pipelines_in_meter_per_residence_fourth_bracket = 6.3
+- heat_length_of_connection_pipelines_in_meter_per_residence_fifth_bracket = 8.9
+- heat_buildings_indoor_investment_costs_eur_per_kw = 152.0
+- heat_buildings_indoor_investment_costs_eur_per_connection = 7563.0
+- heat_yearly_indoor_infrastructure_maintenance_costs_factor = 0.025
+- heat_yearly_outdoor_infrastructure_maintenance_costs_factor = 0.018
+- households_ht_heat_delivery_system_costs_ground_level_houses_eur_per_connection = 2054.0
+- households_ht_heat_delivery_system_costs_apartments_eur_per_connection = 1174.0
+- households_mt_heat_delivery_system_costs_ground_level_houses_eur_per_connection = 2054.0
+- households_mt_heat_delivery_system_costs_apartments_eur_per_connection = 1174.0
+- households_lt_heat_delivery_system_costs_ground_level_houses_eur_per_connection = 4144.0
+- households_lt_heat_delivery_system_costs_apartments_eur_per_connection = 2382.0
+- buildings_lt_heat_delivery_system_costs_eur_per_connection = 25386.0
+- buildings_mt_heat_delivery_system_costs_eur_per_connection = 16706.0
+- buildings_ht_heat_delivery_system_costs_eur_per_connection = 16706.0
+- aquathermal_potential_for_surface_water = 151.5
+- aquathermal_potential_for_waste_water = 69.9
+- aquathermal_potential_for_drink_water = 5.0
+- area_per_building_residence_equivalent = 293.627703981492
+- electric_vehicle_profile_1_share = 0.24
+- electric_vehicle_profile_2_share = 0.56
+- electric_vehicle_profile_3_share = 0.08
+- electric_vehicle_profile_4_share = 0.12
+- electric_vehicle_profile_5_share = 0.0
+- solar_pv_profile_1_share = 1.0
+- solar_pv_profile_2_share = 0.0
+- annual_infrastructure_cost_gas = 819000.2605576628
+- areable_land = 10.41066653520164
+- co2_emission_1990 = 0.08952541896291569
+- coast_line = 0.25438644456715287
+- interconnector_capacity = 3.2996911324120712
+- total_land_area = 18.99211967853792
+- number_of_cars = 4811.908555659381
+- number_of_busses = 5.471282732375571
+- number_of_trucks = 39.03506407155169
+- number_of_vans = 515.9927261419765
+- present_number_of_residences = 4476.809973844131
+- present_number_of_buildings = 514.693719530362
+- present_number_of_apartments_before_1945 = 304.98058049793883
+- present_number_of_apartments_1945_1964 = 219.60939218082828
+- present_number_of_apartments_1965_1984 = 431.1788189938956
+- present_number_of_apartments_1985_2004 = 349.63809263921416
+- present_number_of_apartments_2005_present = 275.35217437770956
+- present_number_of_detached_houses_before_1945 = 160.88109457132188
+- present_number_of_detached_houses_1945_1964 = 80.73526328851314
+- present_number_of_detached_houses_1965_1984 = 130.39984520456147
+- present_number_of_detached_houses_1985_2004 = 142.46035730596915
+- present_number_of_detached_houses_2005_present = 66.74400883731973
+- present_number_of_semi_detached_houses_before_1945 = 171.06726929956625
+- present_number_of_semi_detached_houses_1945_1964 = 168.50422716184312
+- present_number_of_semi_detached_houses_1965_1984 = 319.0773122554162
+- present_number_of_semi_detached_houses_1985_2004 = 214.17533673302353
+- present_number_of_semi_detached_houses_2005_present = 100.8081023191368
+- present_number_of_terraced_houses_before_1945 = 193.288009839972
+- present_number_of_terraced_houses_1945_1964 = 174.47469393732717
+- present_number_of_terraced_houses_1965_1984 = 493.5937458754439
+- present_number_of_terraced_houses_1985_2004 = 338.7547523999166
+- present_number_of_terraced_houses_2005_present = 141.08689612521303
+- number_of_inhabitants = 9748.0
+- offshore_suitable_for_wind = 16.955335972702027
+- residences_roof_surface_available_for_pv = 0.12409094856934286
+- buildings_roof_surface_available_for_pv = 0.13819219272494998
+- energetic_emissions_other_ghg_industry = 5.9296464939024126e-05
+- energetic_emissions_other_ghg_energy = 0.0005126414921419269
+- energetic_emissions_other_ghg_transport = 0.00018189113613151315
+- energetic_emissions_other_ghg_buildings = 2.7164247547022902e-05
+- energetic_emissions_other_ghg_households = 0.0002047842465552489
+- energetic_emissions_other_ghg_agriculture = 0.0006295722350448842
+- non_energetic_emissions_co2_chemical_industry = 0.0011835842505964096
+- non_energetic_emissions_co2_other_industry = 0.0002406512292263416
+- non_energetic_emissions_co2_agriculture_manure = 2.54826967434574e-05
+- non_energetic_emissions_co2_agriculture_soil_cultivation = 1.9709935051532612e-05
+- non_energetic_emissions_co2_waste_management = 0.0
+- non_energetic_emissions_other_ghg_chemical_industry = 0.001175739801799115
+- non_energetic_emissions_other_ghg_other_industry = 0.0009873793927623526
+- non_energetic_emissions_other_ghg_agriculture_fermentation = 0.004589024008510972
+- non_energetic_emissions_other_ghg_agriculture_manure = 0.0026025459948364102
+- non_energetic_emissions_other_ghg_agriculture_soil_cultivation = 0.002719128888248537
+- non_energetic_emissions_other_ghg_agriculture_other = 0.0
+- non_energetic_emissions_other_ghg_waste_management = 0.0016277821504264251
+- indirect_emissions_co2 = 0.00024317781118717607
+- base_dataset = nl2019
+- scaling.area_attribute = number_of_inhabitants
+- scaling.base_value = 17282163
+- scaling.value = 9748
diff --git a/datasets/GM0370_beemster/graph_values.yml b/datasets/GM0370_beemster/graph_values.yml
new file mode 100644
index 0000000000..8d59faa08a
--- /dev/null
+++ b/datasets/GM0370_beemster/graph_values.yml
@@ -0,0 +1 @@
+--- {}
\ No newline at end of file
diff --git a/datasets/GM0373_bergen/GM0373_bergen.derived.ad b/datasets/GM0373_bergen/GM0373_bergen.derived.ad
index 430849e557..424fa7b3ea 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 = 126682
-- parent_id = 126682
+- id = 127131
+- parent_id = 127131
 - 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 1abea4e1d0..994d833011 100644
--- a/datasets/GM0373_bergen/graph_values.yml
+++ b/datasets/GM0373_bergen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.102250692
+  max_demand: 102.25069
 energy_production_oily_biomass:
-  max_demand: 0.018211089
+  max_demand: 18.21109
 energy_production_wet_biomass:
-  max_demand: 0.11733836
+  max_demand: 117.33836
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad b/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad
index 5ee0d075c0..a40aaacbff 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 = 126688
-- parent_id = 126688
+- id = 127137
+- parent_id = 127137
 - 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 c5b0b3113a..df21d3e0d7 100644
--- a/datasets/GM0375_beverwijk/graph_values.yml
+++ b/datasets/GM0375_beverwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.107829379
+  max_demand: 107.82938
 energy_production_oily_biomass:
-  max_demand: 0.025017007
+  max_demand: 25.01701
 energy_production_wet_biomass:
-  max_demand: 0.07621907
+  max_demand: 76.21907
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad b/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad
index e4c2a3eebf..1cd7165a99 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 = 126690
-- parent_id = 126690
+- id = 127139
+- parent_id = 127139
 - 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 bc648c353f..1b11c16fe6 100644
--- a/datasets/GM0376_blaricum/graph_values.yml
+++ b/datasets/GM0376_blaricum/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.032137314
+  max_demand: 32.13731
 energy_production_oily_biomass:
-  max_demand: 0.006805919
+  max_demand: 6.80592
 energy_production_wet_biomass:
-  max_demand: 0.023003791
+  max_demand: 23.00379
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad b/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad
index a093107aa1..5bf94963d0 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 = 126691
-- parent_id = 126691
+- id = 127140
+- parent_id = 127140
 - 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 9f5f9403c5..370b9dea4e 100644
--- a/datasets/GM0377_bloemendaal/graph_values.yml
+++ b/datasets/GM0377_bloemendaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.070611708
+  max_demand: 70.61171
 energy_production_oily_biomass:
-  max_demand: 0.014223046
+  max_demand: 14.22305
 energy_production_wet_biomass:
-  max_demand: 0.058499526
+  max_demand: 58.49953
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0383_castricum/GM0383_castricum.derived.ad b/datasets/GM0383_castricum/GM0383_castricum.derived.ad
index f1f59361bd..39a67f435d 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 = 126706
-- parent_id = 126706
+- id = 127155
+- parent_id = 127155
 - 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 e4f4066580..4fdea986c6 100644
--- a/datasets/GM0383_castricum/graph_values.yml
+++ b/datasets/GM0383_castricum/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.104336447
+  max_demand: 104.33645
 energy_production_oily_biomass:
-  max_demand: 0.021733738
+  max_demand: 21.73374
 energy_production_wet_biomass:
-  max_demand: 0.151502056
+  max_demand: 151.50206
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0384_diemen/GM0384_diemen.derived.ad b/datasets/GM0384_diemen/GM0384_diemen.derived.ad
index b67b8621e4..527cf30822 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 = 126721
-- parent_id = 126721
+- id = 127170
+- parent_id = 127170
 - 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 734b25b8aa..31cd89da81 100644
--- a/datasets/GM0384_diemen/graph_values.yml
+++ b/datasets/GM0384_diemen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.078655134
+  max_demand: 78.65513
 energy_production_oily_biomass:
-  max_demand: 0.017738405
+  max_demand: 17.73841
 energy_production_wet_biomass:
-  max_demand: 0.062426029
+  max_demand: 62.42603
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad b/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad
index 073dc6080a..65f56f0acc 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 = 126733
-- parent_id = 126733
+- id = 127182
+- parent_id = 127182
 - 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 12058bfe75..9de704621f 100644
--- a/datasets/GM0385_edam_volendam/graph_values.yml
+++ b/datasets/GM0385_edam_volendam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.099381128
+  max_demand: 99.38113
 energy_production_oily_biomass:
-  max_demand: 0.021932411
+  max_demand: 21.93241
 energy_production_wet_biomass:
-  max_demand: 0.120892015
+  max_demand: 120.89202
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad b/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad
index 2850afd54f..22ded38747 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 = 126741
-- parent_id = 126741
+- id = 127190
+- parent_id = 127190
 - 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 0da2b59888..3c6f1c37d0 100644
--- a/datasets/GM0388_enkhuizen/graph_values.yml
+++ b/datasets/GM0388_enkhuizen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.051056048
+  max_demand: 51.05605
 energy_production_oily_biomass:
-  max_demand: 0.011244165
+  max_demand: 11.24417
 energy_production_wet_biomass:
-  max_demand: 0.046223852
+  max_demand: 46.22385
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad b/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad
index 98d2c140f0..7efd349aa4 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 = 126760
-- parent_id = 126760
+- id = 127209
+- parent_id = 127209
 - 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 435654f822..2490fcb8d7 100644
--- a/datasets/GM0392_haarlem/graph_values.yml
+++ b/datasets/GM0392_haarlem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.407501419
+  max_demand: 407.50142
 energy_production_oily_biomass:
-  max_demand: 0.097978621
+  max_demand: 97.97862
 energy_production_wet_biomass:
-  max_demand: 0.289080847
+  max_demand: 289.08085
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad b/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad
index 33684addc8..ca6101e1e0 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 = 126761
-- parent_id = 126761
+- id = 127210
+- parent_id = 127210
 - 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 8856d8c1a1..833cf48e0e 100644
--- a/datasets/GM0394_haarlemmermeer/graph_values.yml
+++ b/datasets/GM0394_haarlemmermeer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.473166945
+  max_demand: 473.16695
 energy_production_oily_biomass:
-  max_demand: 0.089960614
+  max_demand: 89.96061
 energy_production_wet_biomass:
-  max_demand: 0.46114545
+  max_demand: 461.14545
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad b/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad
index 7fe45c449f..d58a6be579 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 = 126768
-- parent_id = 126768
+- id = 127217
+- parent_id = 127217
 - 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 5db54bae91..14ffc42925 100644
--- a/datasets/GM0396_heemskerk/graph_values.yml
+++ b/datasets/GM0396_heemskerk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.110343573
+  max_demand: 110.34357
 energy_production_oily_biomass:
-  max_demand: 0.023794591
+  max_demand: 23.79459
 energy_production_wet_biomass:
-  max_demand: 0.077706147
+  max_demand: 77.70615
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad b/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad
index 35c98d7d4f..7361879db4 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 = 126769
-- parent_id = 126769
+- id = 127218
+- parent_id = 127218
 - 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 75acc2ab8c..647ef3875f 100644
--- a/datasets/GM0397_heemstede/graph_values.yml
+++ b/datasets/GM0397_heemstede/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.07052604
+  max_demand: 70.52604
 energy_production_oily_biomass:
-  max_demand: 0.01657796
+  max_demand: 16.57796
 energy_production_wet_biomass:
-  max_demand: 0.050883183
+  max_demand: 50.88318
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad b/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad
index ad505effce..f5a05eb6e8 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 = 126774
-- parent_id = 126774
+- id = 127223
+- parent_id = 127223
 - 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 6fb308ea30..6668f921e4 100644
--- a/datasets/GM0399_heiloo/graph_values.yml
+++ b/datasets/GM0399_heiloo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.063384462
+  max_demand: 63.38446
 energy_production_oily_biomass:
-  max_demand: 0.014255854
+  max_demand: 14.25585
 energy_production_wet_biomass:
-  max_demand: 0.054586765
+  max_demand: 54.58677
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad b/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad
index 4710d2be17..731148f7e3 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 = 126718
-- parent_id = 126718
+- id = 127167
+- parent_id = 127167
 - 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 dcc15c05a9..e8a035940c 100644
--- a/datasets/GM0400_den_helder/graph_values.yml
+++ b/datasets/GM0400_den_helder/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.154488539
+  max_demand: 154.48854
 energy_production_oily_biomass:
-  max_demand: 0.033782924
+  max_demand: 33.78292
 energy_production_wet_biomass:
-  max_demand: 0.138427814
+  max_demand: 138.42781
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad b/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad
index ccfbe776c3..261ad551f2 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 = 126783
-- parent_id = 126783
+- id = 127232
+- parent_id = 127232
 - 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 67a19285eb..544a641348 100644
--- a/datasets/GM0402_hilversum/graph_values.yml
+++ b/datasets/GM0402_hilversum/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.23919425
+  max_demand: 239.19425
 energy_production_oily_biomass:
-  max_demand: 0.054825255
+  max_demand: 54.82526
 energy_production_wet_biomass:
-  max_demand: 0.173437449
+  max_demand: 173.43745
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad b/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad
index e58895aa85..ecd59320e6 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 = 126787
-- parent_id = 126787
+- id = 127236
+- parent_id = 127236
 - 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 81dfd34fae..e48cd32b57 100644
--- a/datasets/GM0405_hoorn/graph_values.yml
+++ b/datasets/GM0405_hoorn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.187669365
+  max_demand: 187.66937
 energy_production_oily_biomass:
-  max_demand: 0.044354517
+  max_demand: 44.35452
 energy_production_wet_biomass:
-  max_demand: 0.124219336
+  max_demand: 124.21934
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0406_huizen/GM0406_huizen.derived.ad b/datasets/GM0406_huizen/GM0406_huizen.derived.ad
index b4ba91587e..30d08fac1f 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 = 126790
-- parent_id = 126790
+- id = 127239
+- parent_id = 127239
 - 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 9b3ce12848..a75e21aaa9 100644
--- a/datasets/GM0406_huizen/graph_values.yml
+++ b/datasets/GM0406_huizen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.109524012
+  max_demand: 109.52401
 energy_production_oily_biomass:
-  max_demand: 0.025075941
+  max_demand: 25.07594
 energy_production_wet_biomass:
-  max_demand: 0.07308148
+  max_demand: 73.08148
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad b/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad
index aa88ed5e3f..afa9747c51 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 = 126803
-- parent_id = 126803
+- id = 127252
+- parent_id = 127252
 - 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 fb629f1215..58e630ddb4 100644
--- a/datasets/GM0415_landsmeer/graph_values.yml
+++ b/datasets/GM0415_landsmeer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.031844013
+  max_demand: 31.84401
 energy_production_oily_biomass:
-  max_demand: 0.006979682
+  max_demand: 6.97968
 energy_production_wet_biomass:
-  max_demand: 0.101037833
+  max_demand: 101.03783
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0417_laren/GM0417_laren.derived.ad b/datasets/GM0417_laren/GM0417_laren.derived.ad
index 9c4ff2516d..2a04fc7063 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 = 126805
-- parent_id = 126805
+- id = 127254
+- parent_id = 127254
 - 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 4296cee71e..6095968e60 100644
--- a/datasets/GM0417_laren/graph_values.yml
+++ b/datasets/GM0417_laren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.032030384
+  max_demand: 32.03038
 energy_production_oily_biomass:
-  max_demand: 0.006801666
+  max_demand: 6.80167
 energy_production_wet_biomass:
-  max_demand: 0.021415163
+  max_demand: 21.41516
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad b/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad
index adc1d40c8d..5e8481b9db 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 = 126823
-- parent_id = 126823
+- id = 127272
+- parent_id = 127272
 - 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 796859601d..8d59a07157 100644
--- a/datasets/GM0420_medemblik/graph_values.yml
+++ b/datasets/GM0420_medemblik/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.13909779
+  max_demand: 139.09779
 energy_production_oily_biomass:
-  max_demand: 0.027224283
+  max_demand: 27.22428
 energy_production_wet_biomass:
-  max_demand: 0.286227615
+  max_demand: 286.22762
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad b/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad
index 07c612d9b4..7d912e62bb 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 = 126857
-- parent_id = 126857
+- id = 127306
+- parent_id = 127306
 - 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 eb8f2a3623..2e5d595a17 100644
--- a/datasets/GM0431_oostzaan/graph_values.yml
+++ b/datasets/GM0431_oostzaan/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.025059125
+  max_demand: 25.05913
 energy_production_oily_biomass:
-  max_demand: 0.005927991
+  max_demand: 5.92799
 energy_production_wet_biomass:
-  max_demand: 0.078277409
+  max_demand: 78.27741
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad b/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad
index 4635368325..e3cbbaf52b 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 = 126858
-- parent_id = 126858
+- id = 127307
+- parent_id = 127307
 - 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 8805c9b4fb..b14783335b 100644
--- a/datasets/GM0432_opmeer/graph_values.yml
+++ b/datasets/GM0432_opmeer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.042337877
+  max_demand: 42.33788
 energy_production_oily_biomass:
-  max_demand: 0.007156483
+  max_demand: 7.15648
 energy_production_wet_biomass:
-  max_demand: 0.102021699
+  max_demand: 102.0217
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad b/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad
index e0e26f9223..90823c109b 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 = 126862
-- parent_id = 126862
+- id = 127311
+- parent_id = 127311
 - 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 a3fbdd0a67..99de4a1181 100644
--- a/datasets/GM0437_ouder_amstel/graph_values.yml
+++ b/datasets/GM0437_ouder_amstel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.040773792
+  max_demand: 40.77379
 energy_production_oily_biomass:
-  max_demand: 0.008454844
+  max_demand: 8.45484
 energy_production_wet_biomass:
-  max_demand: 0.06400262
+  max_demand: 64.00262
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad b/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad
index 72f71b873a..4c7229e6d6 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 = 126869
-- parent_id = 126869
+- id = 127318
+- parent_id = 127318
 - 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 fab6857239..fdb97fdd39 100644
--- a/datasets/GM0439_purmerend/graph_values.yml
+++ b/datasets/GM0439_purmerend/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.208341368
+  max_demand: 208.34137
 energy_production_oily_biomass:
-  max_demand: 0.048676112
+  max_demand: 48.67611
 energy_production_wet_biomass:
-  max_demand: 0.147452558
+  max_demand: 147.45256
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0441_schagen/GM0441_schagen.derived.ad b/datasets/GM0441_schagen/GM0441_schagen.derived.ad
index 9373c213f0..1109093ce7 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 = 126887
-- parent_id = 126887
+- id = 127336
+- parent_id = 127336
 - 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 46a2fea939..f544ef459b 100644
--- a/datasets/GM0441_schagen/graph_values.yml
+++ b/datasets/GM0441_schagen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.152239246
+  max_demand: 152.23925
 energy_production_oily_biomass:
-  max_demand: 0.028283873
+  max_demand: 28.28387
 energy_production_wet_biomass:
-  max_demand: 0.398657334
+  max_demand: 398.65733
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0448_texel/GM0448_texel.derived.ad b/datasets/GM0448_texel/GM0448_texel.derived.ad
index 0e7a4e9573..922f24e7f4 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 = 126912
-- parent_id = 126912
+- id = 127361
+- parent_id = 127361
 - 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 181cb7ea15..da5db09ed0 100644
--- a/datasets/GM0448_texel/graph_values.yml
+++ b/datasets/GM0448_texel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.070931543
+  max_demand: 70.93154
 energy_production_oily_biomass:
-  max_demand: 0.008230654
+  max_demand: 8.23065
 energy_production_wet_biomass:
-  max_demand: 1.445862789
+  max_demand: 1445.86279
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad b/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad
index 82be43e945..6fc2b8fe96 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 = 126921
-- parent_id = 126921
+- id = 127370
+- parent_id = 127370
 - 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 104737e996..c074509be5 100644
--- a/datasets/GM0450_uitgeest/graph_values.yml
+++ b/datasets/GM0450_uitgeest/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.037893643
+  max_demand: 37.89364
 energy_production_oily_biomass:
-  max_demand: 0.00821911
+  max_demand: 8.21911
 energy_production_wet_biomass:
-  max_demand: 0.082642618
+  max_demand: 82.64262
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad b/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad
index abb854d0c1..31e2393afb 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 = 126922
-- parent_id = 126922
+- id = 127371
+- parent_id = 127371
 - 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 f316dea7d3..c459bca250 100644
--- a/datasets/GM0451_uithoorn/graph_values.yml
+++ b/datasets/GM0451_uithoorn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.079401363
+  max_demand: 79.40136
 energy_production_oily_biomass:
-  max_demand: 0.017876929
+  max_demand: 17.87693
 energy_production_wet_biomass:
-  max_demand: 0.067268063
+  max_demand: 67.26806
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0453_velsen/GM0453_velsen.derived.ad b/datasets/GM0453_velsen/GM0453_velsen.derived.ad
index 1f4212d26d..8bd0afcccf 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 = 126933
-- parent_id = 126933
+- id = 127382
+- parent_id = 127382
 - 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 c532b0b45f..0a6c67911f 100644
--- a/datasets/GM0453_velsen/graph_values.yml
+++ b/datasets/GM0453_velsen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.188949526
+  max_demand: 188.94953
 energy_production_oily_biomass:
-  max_demand: 0.041525705
+  max_demand: 41.52571
 energy_production_wet_biomass:
-  max_demand: 0.162937677
+  max_demand: 162.93768
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad b/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad
index dbfcce5e6d..0fef2ec77c 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 = 126966
-- parent_id = 126966
+- id = 127415
+- parent_id = 127415
 - 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 0ebd64c2d6..7f632fc632 100644
--- a/datasets/GM0473_zandvoort/graph_values.yml
+++ b/datasets/GM0473_zandvoort/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.045680434
+  max_demand: 45.68043
 energy_production_oily_biomass:
-  max_demand: 0.010335251
+  max_demand: 10.33525
 energy_production_wet_biomass:
-  max_demand: 0.048425032
+  max_demand: 48.42503
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad b/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad
index b2e9cc9264..b196df5e4c 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 = 126964
-- parent_id = 126964
+- id = 127413
+- parent_id = 127413
 - 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 fac84ee18a..aaf19050cf 100644
--- a/datasets/GM0479_zaanstad/graph_values.yml
+++ b/datasets/GM0479_zaanstad/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.402910059
+  max_demand: 402.91006
 energy_production_oily_biomass:
-  max_demand: 0.094709933
+  max_demand: 94.70993
 energy_production_wet_biomass:
-  max_demand: 0.414401548
+  max_demand: 414.40155
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad b/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad
index a5268c4c09..a69b654383 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 = 126658
-- parent_id = 126658
+- id = 127107
+- parent_id = 127107
 - 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 5bfbcd3c3e..e7d09d3a3f 100644
--- a/datasets/GM0482_alblasserdam/graph_values.yml
+++ b/datasets/GM0482_alblasserdam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.051742699
+  max_demand: 51.7427
 energy_production_oily_biomass:
-  max_demand: 0.012193179
+  max_demand: 12.19318
 energy_production_wet_biomass:
-  max_demand: 0.041201929
+  max_demand: 41.20193
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 71b31fee86..f04c42a75a 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 = 126663
-- parent_id = 126663
+- id = 127112
+- parent_id = 127112
 - 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 23b9f116cf..4bda5a7b0a 100644
--- a/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml
+++ b/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.318283439
+  max_demand: 318.28344
 energy_production_oily_biomass:
-  max_demand: 0.067430969
+  max_demand: 67.43097
 energy_production_wet_biomass:
-  max_demand: 0.406048468
+  max_demand: 406.04847
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad b/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad
index 70c0b5cd01..bbe97ac83b 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 = 126675
-- parent_id = 126675
+- id = 127124
+- parent_id = 127124
 - 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 858868cbb9..8faca05aa6 100644
--- a/datasets/GM0489_barendrecht/graph_values.yml
+++ b/datasets/GM0489_barendrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.131095593
+  max_demand: 131.09559
 energy_production_oily_biomass:
-  max_demand: 0.029571906
+  max_demand: 29.57191
 energy_production_wet_biomass:
-  max_demand: 0.092845258
+  max_demand: 92.84526
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad b/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad
index ccee6cb6ff..ac9e0faaff 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 = 126727
-- parent_id = 126727
+- id = 127176
+- parent_id = 127176
 - 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 223007370f..720f1f0e37 100644
--- a/datasets/GM0498_drechterland/graph_values.yml
+++ b/datasets/GM0498_drechterland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.061876527
+  max_demand: 61.87653
 energy_production_oily_biomass:
-  max_demand: 0.011906409
+  max_demand: 11.90641
 energy_production_wet_biomass:
-  max_demand: 0.123428543
+  max_demand: 123.42854
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 6cb0615d6b..a33516dda0 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 = 126705
-- parent_id = 126705
+- id = 127154
+- parent_id = 127154
 - 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 a54bee960b..6bb76a9bc5 100644
--- a/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml
+++ b/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.174023953
+  max_demand: 174.02395
 energy_production_oily_biomass:
-  max_demand: 0.040596134
+  max_demand: 40.59613
 energy_production_wet_biomass:
-  max_demand: 0.119651038
+  max_demand: 119.65104
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0503_delft/GM0503_delft.derived.ad b/datasets/GM0503_delft/GM0503_delft.derived.ad
index 1750c3df5f..58197663e3 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 = 126716
-- parent_id = 126716
+- id = 127165
+- parent_id = 127165
 - 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 39555408fe..56b12d5dd4 100644
--- a/datasets/GM0503_delft/graph_values.yml
+++ b/datasets/GM0503_delft/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.268071256
+  max_demand: 268.07126
 energy_production_oily_biomass:
-  max_demand: 0.062678005
+  max_demand: 62.67801
 energy_production_wet_biomass:
-  max_demand: 0.187995102
+  max_demand: 187.9951
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad b/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad
index 849ef87435..558ff78e4f 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 = 126726
-- parent_id = 126726
+- id = 127175
+- parent_id = 127175
 - 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 f99ad9c4c3..3f73376a4a 100644
--- a/datasets/GM0505_dordrecht/graph_values.yml
+++ b/datasets/GM0505_dordrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.329418148
+  max_demand: 329.41815
 energy_production_oily_biomass:
-  max_demand: 0.072089761
+  max_demand: 72.08976
 energy_production_wet_biomass:
-  max_demand: 0.417769549
+  max_demand: 417.76955
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad b/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad
index fd219f1247..40eec36cda 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 = 126755
-- parent_id = 126755
+- id = 127204
+- parent_id = 127204
 - 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 f1d111e475..0baeace55b 100644
--- a/datasets/GM0512_gorinchem/graph_values.yml
+++ b/datasets/GM0512_gorinchem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.099069369
+  max_demand: 99.06937
 energy_production_oily_biomass:
-  max_demand: 0.02228662
+  max_demand: 22.28662
 energy_production_wet_biomass:
-  max_demand: 0.086850655
+  max_demand: 86.85066
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0513_gouda/GM0513_gouda.derived.ad b/datasets/GM0513_gouda/GM0513_gouda.derived.ad
index 0da076ff9d..a1c9b1d0dd 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 = 126756
-- parent_id = 126756
+- id = 127205
+- parent_id = 127205
 - 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 4967fe2904..5bead662ea 100644
--- a/datasets/GM0513_gouda/graph_values.yml
+++ b/datasets/GM0513_gouda/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.184149912
+  max_demand: 184.14991
 energy_production_oily_biomass:
-  max_demand: 0.044462056
+  max_demand: 44.46206
 energy_production_wet_biomass:
-  max_demand: 0.132139149
+  max_demand: 132.13915
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad b/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad
index 53cecbe161..1a17c9be16 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 = 126717
-- parent_id = 126717
+- id = 127166
+- parent_id = 127166
 - 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 cbfdbfc3f0..cc2e135fcd 100644
--- a/datasets/GM0518_s_gravenhage/graph_values.yml
+++ b/datasets/GM0518_s_gravenhage/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 1.347863809
+  max_demand: 1347.86381
 energy_production_oily_biomass:
-  max_demand: 0.326767344
+  max_demand: 326.76734
 energy_production_wet_biomass:
-  max_demand: 0.87632155
+  max_demand: 876.32155
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad b/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad
index ee4432c78f..e2f5cc67fc 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 = 126765
-- parent_id = 126765
+- id = 127214
+- parent_id = 127214
 - 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 f6e3ab0a63..ea80468147 100644
--- a/datasets/GM0523_hardinxveld_giessendam/graph_values.yml
+++ b/datasets/GM0523_hardinxveld_giessendam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.048973348
+  max_demand: 48.97335
 energy_production_oily_biomass:
-  max_demand: 0.010967117
+  max_demand: 10.96712
 energy_production_wet_biomass:
-  max_demand: 0.067055028
+  max_demand: 67.05503
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 4723934e2e..e6481ca4b0 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 = 126777
-- parent_id = 126777
+- id = 127226
+- parent_id = 127226
 - 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 8259ec5117..13fb0e181f 100644
--- a/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml
+++ b/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.078222006
+  max_demand: 78.22201
 energy_production_oily_biomass:
-  max_demand: 0.018813791
+  max_demand: 18.81379
 energy_production_wet_biomass:
-  max_demand: 0.053183467
+  max_demand: 53.18347
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad b/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad
index 13f3fdefbb..2e43267fa4 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 = 126904
-- parent_id = 126904
+- id = 127353
+- parent_id = 127353
 - 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 96bd0dfc1b..b231262409 100644
--- a/datasets/GM0532_stede_broec/graph_values.yml
+++ b/datasets/GM0532_stede_broec/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.059785565
+  max_demand: 59.78557
 energy_production_oily_biomass:
-  max_demand: 0.013187759
+  max_demand: 13.18776
 energy_production_wet_biomass:
-  max_demand: 0.066069109
+  max_demand: 66.06911
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad b/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad
index e2803a7a43..398457760f 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 = 126781
-- parent_id = 126781
+- id = 127230
+- parent_id = 127230
 - 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 ac646779ef..a08f340c94 100644
--- a/datasets/GM0534_hillegom/graph_values.yml
+++ b/datasets/GM0534_hillegom/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.055402552
+  max_demand: 55.40255
 energy_production_oily_biomass:
-  max_demand: 0.013345725
+  max_demand: 13.34573
 energy_production_wet_biomass:
-  max_demand: 0.047570256
+  max_demand: 47.57026
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad b/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad
index 6df147506c..47184bc964 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 = 126796
-- parent_id = 126796
+- id = 127245
+- parent_id = 127245
 - 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 87e5f9e394..9fb873b28d 100644
--- a/datasets/GM0537_katwijk/graph_values.yml
+++ b/datasets/GM0537_katwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.164886791
+  max_demand: 164.88679
 energy_production_oily_biomass:
-  max_demand: 0.039675068
+  max_demand: 39.67507
 energy_production_wet_biomass:
-  max_demand: 0.121642973
+  max_demand: 121.64297
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 89e86ddb27..49fce4cc98 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 = 126799
-- parent_id = 126799
+- id = 127248
+- parent_id = 127248
 - 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 a3d2fa0bfe..810d5d6cc8 100644
--- a/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml
+++ b/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.075603823
+  max_demand: 75.60382
 energy_production_oily_biomass:
-  max_demand: 0.017847766
+  max_demand: 17.84777
 energy_production_wet_biomass:
-  max_demand: 0.056162529
+  max_demand: 56.16253
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0546_leiden/GM0546_leiden.derived.ad b/datasets/GM0546_leiden/GM0546_leiden.derived.ad
index 5a202c1e69..ef6dfd2a1c 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 = 126807
-- parent_id = 126807
+- id = 127256
+- parent_id = 127256
 - 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 45cc2572c6..fc034e0985 100644
--- a/datasets/GM0546_leiden/graph_values.yml
+++ b/datasets/GM0546_leiden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.312411951
+  max_demand: 312.41195
 energy_production_oily_biomass:
-  max_demand: 0.075883991
+  max_demand: 75.88399
 energy_production_wet_biomass:
-  max_demand: 0.210520859
+  max_demand: 210.52086
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad b/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad
index 7ec456f411..e13297dee9 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 = 126808
-- parent_id = 126808
+- id = 127257
+- parent_id = 127257
 - 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 5452be6f1b..4873ba38b3 100644
--- a/datasets/GM0547_leiderdorp/graph_values.yml
+++ b/datasets/GM0547_leiderdorp/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.070630826
+  max_demand: 70.63083
 energy_production_oily_biomass:
-  max_demand: 0.016470421
+  max_demand: 16.47042
 energy_production_wet_biomass:
-  max_demand: 0.057403092
+  max_demand: 57.40309
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0553_lisse/GM0553_lisse.derived.ad b/datasets/GM0553_lisse/GM0553_lisse.derived.ad
index ba223a04a6..e4bb7a715c 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 = 126814
-- parent_id = 126814
+- id = 127263
+- parent_id = 127263
 - 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 fec81ef9e6..986e14b24c 100644
--- a/datasets/GM0553_lisse/graph_values.yml
+++ b/datasets/GM0553_lisse/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.060258246
+  max_demand: 60.25825
 energy_production_oily_biomass:
-  max_demand: 0.013852433
+  max_demand: 13.85243
 energy_production_wet_biomass:
-  max_demand: 0.052211126
+  max_demand: 52.21113
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad b/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad
index 3a8180394f..9f44134271 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 = 126821
-- parent_id = 126821
+- id = 127270
+- parent_id = 127270
 - 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 30a84afa29..dd636630d6 100644
--- a/datasets/GM0556_maassluis/graph_values.yml
+++ b/datasets/GM0556_maassluis/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.083415055
+  max_demand: 83.41506
 energy_production_oily_biomass:
-  max_demand: 0.019908619
+  max_demand: 19.90862
 energy_production_wet_biomass:
-  max_demand: 0.056751107
+  max_demand: 56.75111
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad b/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad
index 435c620174..3689d17038 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 = 126836
-- parent_id = 126836
+- id = 127285
+- parent_id = 127285
 - 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 022091f056..ba628bb97b 100644
--- a/datasets/GM0569_nieuwkoop/graph_values.yml
+++ b/datasets/GM0569_nieuwkoop/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.093258164
+  max_demand: 93.25816
 energy_production_oily_biomass:
-  max_demand: 0.017393309
+  max_demand: 17.39331
 energy_production_wet_biomass:
-  max_demand: 0.343263225
+  max_demand: 343.26323
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad b/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad
index 2a79b53150..ab44b1ead6 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 = 126843
-- parent_id = 126843
+- id = 127292
+- parent_id = 127292
 - 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 de39278d79..77ee838db7 100644
--- a/datasets/GM0575_noordwijk/graph_values.yml
+++ b/datasets/GM0575_noordwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.070540169
+  max_demand: 70.54017
 energy_production_oily_biomass:
-  max_demand: 0.01590235
+  max_demand: 15.90235
 energy_production_wet_biomass:
-  max_demand: 0.050308516
+  max_demand: 50.30852
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad b/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad
index 4c3815359f..16a07d08f2 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 = 126846
-- parent_id = 126846
+- id = 127295
+- parent_id = 127295
 - 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 1c8229f4cd..834afeb6f8 100644
--- a/datasets/GM0579_oegstgeest/graph_values.yml
+++ b/datasets/GM0579_oegstgeest/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.063053897
+  max_demand: 63.0539
 energy_production_oily_biomass:
-  max_demand: 0.01484033
+  max_demand: 14.84033
 energy_production_wet_biomass:
-  max_demand: 0.047290181
+  max_demand: 47.29018
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad b/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad
index dda391ffad..5293fa294e 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 = 126863
-- parent_id = 126863
+- id = 127312
+- parent_id = 127312
 - 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 8e09176ed9..6547e2c3a0 100644
--- a/datasets/GM0589_oudewater/graph_values.yml
+++ b/datasets/GM0589_oudewater/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.043957704
+  max_demand: 43.9577
 energy_production_oily_biomass:
-  max_demand: 0.006197749
+  max_demand: 6.19775
 energy_production_wet_biomass:
-  max_demand: 0.113550838
+  max_demand: 113.55084
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad b/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad
index 0b170944ce..ecf993ee0e 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 = 126865
-- parent_id = 126865
+- id = 127314
+- parent_id = 127314
 - 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 ca8ad22c39..d6e609beeb 100644
--- a/datasets/GM0590_papendrecht/graph_values.yml
+++ b/datasets/GM0590_papendrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.085370599
+  max_demand: 85.3706
 energy_production_oily_biomass:
-  max_demand: 0.019618204
+  max_demand: 19.6182
 energy_production_wet_biomass:
-  max_demand: 0.057024475
+  max_demand: 57.02448
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad b/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad
index 7fcdb7ec9f..89ec7eb7e3 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 = 126878
-- parent_id = 126878
+- id = 127327
+- parent_id = 127327
 - 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 f5303ef63b..e10747949a 100644
--- a/datasets/GM0597_ridderkerk/graph_values.yml
+++ b/datasets/GM0597_ridderkerk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.128027392
+  max_demand: 128.02739
 energy_production_oily_biomass:
-  max_demand: 0.028094313
+  max_demand: 28.09431
 energy_production_wet_biomass:
-  max_demand: 0.086954239
+  max_demand: 86.95424
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad b/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad
index 1f761e2894..99616548d5 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 = 126884
-- parent_id = 126884
+- id = 127333
+- parent_id = 127333
 - 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 a1597dc601..2b23d4fa77 100644
--- a/datasets/GM0599_rotterdam/graph_values.yml
+++ b/datasets/GM0599_rotterdam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 1.683706381
+  max_demand: 1683.70638
 energy_production_oily_biomass:
-  max_demand: 0.391645942
+  max_demand: 391.64594
 energy_production_wet_biomass:
-  max_demand: 1.615949957
+  max_demand: 1615.94996
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad b/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad
index b02009a93c..f5654ac615 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 = 126880
-- parent_id = 126880
+- id = 127329
+- parent_id = 127329
 - 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 c5f897308a..25234beae6 100644
--- a/datasets/GM0603_rijswijk/graph_values.yml
+++ b/datasets/GM0603_rijswijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.14776885
+  max_demand: 147.76885
 energy_production_oily_biomass:
-  max_demand: 0.032484562
+  max_demand: 32.48456
 energy_production_wet_biomass:
-  max_demand: 0.095146898
+  max_demand: 95.1469
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad b/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad
index 1f551dfcf2..8855289737 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 = 126889
-- parent_id = 126889
+- id = 127338
+- parent_id = 127338
 - 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 959628490e..3509e8037e 100644
--- a/datasets/GM0606_schiedam/graph_values.yml
+++ b/datasets/GM0606_schiedam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.203323097
+  max_demand: 203.3231
 energy_production_oily_biomass:
-  max_demand: 0.047389294
+  max_demand: 47.38929
 energy_production_wet_biomass:
-  max_demand: 0.144260498
+  max_demand: 144.2605
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad b/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad
index 94cc866155..9c407a4327 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 = 126896
-- parent_id = 126896
+- id = 127345
+- parent_id = 127345
 - 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 9a77a4369d..fe4ce44596 100644
--- a/datasets/GM0610_sliedrecht/graph_values.yml
+++ b/datasets/GM0610_sliedrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.06474627
+  max_demand: 64.74627
 energy_production_oily_biomass:
-  max_demand: 0.015204868
+  max_demand: 15.20487
 energy_production_wet_biomass:
-  max_demand: 0.048059759
+  max_demand: 48.05976
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad b/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad
index 7cfe1c609f..94b46b8aae 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 = 126659
-- parent_id = 126659
+- id = 127108
+- parent_id = 127108
 - 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 b39cc38c68..a5580ffeca 100644
--- a/datasets/GM0613_albrandswaard/graph_values.yml
+++ b/datasets/GM0613_albrandswaard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.074128048
+  max_demand: 74.12805
 energy_production_oily_biomass:
-  max_demand: 0.01535372
+  max_demand: 15.35372
 energy_production_wet_biomass:
-  max_demand: 0.068674876
+  max_demand: 68.67488
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad b/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad
index 4654283892..93e37213c6 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 = 126936
-- parent_id = 126936
+- id = 127385
+- parent_id = 127385
 - 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 58719e5583..758a90fa83 100644
--- a/datasets/GM0622_vlaardingen/graph_values.yml
+++ b/datasets/GM0622_vlaardingen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.189264854
+  max_demand: 189.26485
 energy_production_oily_biomass:
-  max_demand: 0.04398998
+  max_demand: 43.98998
 energy_production_wet_biomass:
-  max_demand: 0.136845174
+  max_demand: 136.84517
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad b/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad
index c82cd11867..2d4db972cf 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 = 126940
-- parent_id = 126940
+- id = 127389
+- parent_id = 127389
 - 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 c0678b26a3..270b8a5a5a 100644
--- a/datasets/GM0626_voorschoten/graph_values.yml
+++ b/datasets/GM0626_voorschoten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.068853115
+  max_demand: 68.85312
 energy_production_oily_biomass:
-  max_demand: 0.015480094
+  max_demand: 15.48009
 energy_production_wet_biomass:
-  max_demand: 0.050511362
+  max_demand: 50.51136
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad b/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad
index db8b2c5026..84288f97b0 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 = 126945
-- parent_id = 126945
+- id = 127394
+- parent_id = 127394
 - 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 29b6d638e9..be3106780e 100644
--- a/datasets/GM0627_waddinxveen/graph_values.yml
+++ b/datasets/GM0627_waddinxveen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.084193827
+  max_demand: 84.19383
 energy_production_oily_biomass:
-  max_demand: 0.017203749
+  max_demand: 17.20375
 energy_production_wet_biomass:
-  max_demand: 0.080349604
+  max_demand: 80.3496
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad b/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad
index 0aad403e81..aa8fd1dfce 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 = 126947
-- parent_id = 126947
+- id = 127396
+- parent_id = 127396
 - 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 7716063fbf..c9869e7912 100644
--- a/datasets/GM0629_wassenaar/graph_values.yml
+++ b/datasets/GM0629_wassenaar/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.082749088
+  max_demand: 82.74909
 energy_production_oily_biomass:
-  max_demand: 0.01592483
+  max_demand: 15.92483
 energy_production_wet_biomass:
-  max_demand: 0.084603859
+  max_demand: 84.60386
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0632_woerden/GM0632_woerden.derived.ad b/datasets/GM0632_woerden/GM0632_woerden.derived.ad
index d7adf8d4a8..043d57375f 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 = 126961
-- parent_id = 126961
+- id = 127410
+- parent_id = 127410
 - 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 3a4513284b..2dfe6305bc 100644
--- a/datasets/GM0632_woerden/graph_values.yml
+++ b/datasets/GM0632_woerden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.15444704
+  max_demand: 154.44704
 energy_production_oily_biomass:
-  max_demand: 0.031712957
+  max_demand: 31.71296
 energy_production_wet_biomass:
-  max_demand: 0.279898837
+  max_demand: 279.89884
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad b/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad
index b4f29ac733..631796c5f9 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 = 126970
-- parent_id = 126970
+- id = 127419
+- parent_id = 127419
 - 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 b406686528..a975af7dbd 100644
--- a/datasets/GM0637_zoetermeer/graph_values.yml
+++ b/datasets/GM0637_zoetermeer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.335464609
+  max_demand: 335.46461
 energy_production_oily_biomass:
-  max_demand: 0.075911331
+  max_demand: 75.91133
 energy_production_wet_biomass:
-  max_demand: 0.239166782
+  max_demand: 239.16678
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad b/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad
index 51b8b22407..2ca4abd912 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 = 126971
-- parent_id = 126971
+- id = 127420
+- parent_id = 127420
 - 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 f832513ba0..b2edfb9fad 100644
--- a/datasets/GM0638_zoeterwoude/graph_values.yml
+++ b/datasets/GM0638_zoeterwoude/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.026889891
+  max_demand: 26.88989
 energy_production_oily_biomass:
-  max_demand: 0.005133906
+  max_demand: 5.13391
 energy_production_wet_biomass:
-  max_demand: 0.058928538
+  max_demand: 58.92854
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad b/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad
index bb0a6c7290..949e888a5e 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 = 126976
-- parent_id = 126976
+- id = 127425
+- parent_id = 127425
 - 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 324a09efa9..1199f01338 100644
--- a/datasets/GM0642_zwijndrecht/graph_values.yml
+++ b/datasets/GM0642_zwijndrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.119010157
+  max_demand: 119.01016
 energy_production_oily_biomass:
-  max_demand: 0.027120998
+  max_demand: 27.121
 energy_production_wet_biomass:
-  max_demand: 0.088153871
+  max_demand: 88.15387
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0654_borsele/GM0654_borsele.derived.ad b/datasets/GM0654_borsele/GM0654_borsele.derived.ad
index c8cc841d27..0684a508a0 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 = 126696
-- parent_id = 126696
+- id = 127145
+- parent_id = 127145
 - 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 58046a6efa..ae2b240d21 100644
--- a/datasets/GM0654_borsele/graph_values.yml
+++ b/datasets/GM0654_borsele/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.125984232
+  max_demand: 125.98423
 energy_production_oily_biomass:
-  max_demand: 0.013852433
+  max_demand: 13.85243
 energy_production_wet_biomass:
-  max_demand: 0.412077752
+  max_demand: 412.07775
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0664_goes/GM0664_goes.derived.ad b/datasets/GM0664_goes/GM0664_goes.derived.ad
index ab857f8f23..65b75c33d8 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 = 126752
-- parent_id = 126752
+- id = 127201
+- parent_id = 127201
 - 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 e262a2f124..65778c2a96 100644
--- a/datasets/GM0664_goes/graph_values.yml
+++ b/datasets/GM0664_goes/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.147211242
+  max_demand: 147.21124
 energy_production_oily_biomass:
-  max_demand: 0.022876564
+  max_demand: 22.87656
 energy_production_wet_biomass:
-  max_demand: 0.285474789
+  max_demand: 285.47479
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 b996e63ac2..e0f275d6e4 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 = 126950
-- parent_id = 126950
+- id = 127399
+- parent_id = 127399
 - 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 791d2b2aa1..5a192a200d 100644
--- a/datasets/GM0668_west_maas_en_waal/graph_values.yml
+++ b/datasets/GM0668_west_maas_en_waal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.086251893
+  max_demand: 86.25189
 energy_production_oily_biomass:
-  max_demand: 0.011589869
+  max_demand: 11.58987
 energy_production_wet_biomass:
-  max_demand: 0.194350145
+  max_demand: 194.35015
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0677_hulst/GM0677_hulst.derived.ad b/datasets/GM0677_hulst/GM0677_hulst.derived.ad
index e919c17b86..cf90aac1b0 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 = 126791
-- parent_id = 126791
+- id = 127240
+- parent_id = 127240
 - 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 ccbcba6580..9c054611f7 100644
--- a/datasets/GM0677_hulst/graph_values.yml
+++ b/datasets/GM0677_hulst/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.169795897
+  max_demand: 169.7959
 energy_production_oily_biomass:
-  max_demand: 0.01672256
+  max_demand: 16.72256
 energy_production_wet_biomass:
-  max_demand: 0.788609254
+  max_demand: 788.60925
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad b/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad
index 7e83d9fab7..fcf2772529 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 = 126795
-- parent_id = 126795
+- id = 127244
+- parent_id = 127244
 - 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 3afa28beaf..2078f9246c 100644
--- a/datasets/GM0678_kapelle/graph_values.yml
+++ b/datasets/GM0678_kapelle/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.04871986
+  max_demand: 48.71986
 energy_production_oily_biomass:
-  max_demand: 0.007767691
+  max_demand: 7.76769
 energy_production_wet_biomass:
-  max_demand: 0.111272019
+  max_demand: 111.27202
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad b/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad
index 6a48f7b153..6b5d91239a 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 = 126826
-- parent_id = 126826
+- id = 127275
+- parent_id = 127275
 - 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 686bafde98..148500e575 100644
--- a/datasets/GM0687_middelburg/graph_values.yml
+++ b/datasets/GM0687_middelburg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.14418573
+  max_demand: 144.18573
 energy_production_oily_biomass:
-  max_demand: 0.02949353
+  max_demand: 29.49353
 energy_production_wet_biomass:
-  max_demand: 1.377164675
+  max_demand: 1377.16468
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad b/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad
index 6844a09508..bdb109f74f 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 = 126872
-- parent_id = 126872
+- id = 127321
+- parent_id = 127321
 - 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 7a59c5f24b..e4967dc78e 100644
--- a/datasets/GM0703_reimerswaal/graph_values.yml
+++ b/datasets/GM0703_reimerswaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.110359211
+  max_demand: 110.35921
 energy_production_oily_biomass:
-  max_demand: 0.01377831
+  max_demand: 13.77831
 energy_production_wet_biomass:
-  max_demand: 0.395432246
+  max_demand: 395.43225
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad b/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad
index e5d667a84b..10c4d3c90c 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 = 126910
-- parent_id = 126910
+- id = 127359
+- parent_id = 127359
 - 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 8b18a63df3..d130eb5d1b 100644
--- a/datasets/GM0715_terneuzen/graph_values.yml
+++ b/datasets/GM0715_terneuzen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.266244989
+  max_demand: 266.24499
 energy_production_oily_biomass:
-  max_demand: 0.033166248
+  max_demand: 33.16625
 energy_production_wet_biomass:
-  max_demand: 0.719336511
+  max_demand: 719.33651
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0716_tholen/GM0716_tholen.derived.ad b/datasets/GM0716_tholen/GM0716_tholen.derived.ad
index e0e76e9b74..d81fe4eb43 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 = 126914
-- parent_id = 126914
+- id = 127363
+- parent_id = 127363
 - 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 c035eaec0a..9881e8ddf1 100644
--- a/datasets/GM0716_tholen/graph_values.yml
+++ b/datasets/GM0716_tholen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.134154359
+  max_demand: 134.15436
 energy_production_oily_biomass:
-  max_demand: 0.01566297
+  max_demand: 15.66297
 energy_production_wet_biomass:
-  max_demand: 0.512079802
+  max_demand: 512.0798
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0717_veere/GM0717_veere.derived.ad b/datasets/GM0717_veere/GM0717_veere.derived.ad
index b6733cc103..65c3cb3483 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 = 126931
-- parent_id = 126931
+- id = 127380
+- parent_id = 127380
 - 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 3048e18b4b..0dddafbdb6 100644
--- a/datasets/GM0717_veere/graph_values.yml
+++ b/datasets/GM0717_veere/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.135382284
+  max_demand: 135.38228
 energy_production_oily_biomass:
-  max_demand: 0.013266135
+  max_demand: 13.26614
 energy_production_wet_biomass:
-  max_demand: 2.639847245
+  max_demand: 2639.84725
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad b/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad
index 04d55476bf..c1139f9f42 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 = 126938
-- parent_id = 126938
+- id = 127387
+- parent_id = 127387
 - 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 66ed7087a5..6284e19a14 100644
--- a/datasets/GM0718_vlissingen/graph_values.yml
+++ b/datasets/GM0718_vlissingen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.12208288
+  max_demand: 122.08288
 energy_production_oily_biomass:
-  max_demand: 0.026958171
+  max_demand: 26.95817
 energy_production_wet_biomass:
-  max_demand: 1.308352311
+  max_demand: 1308.35231
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 0884a98eaa..0e166e3f34 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 = 126714
-- parent_id = 126714
+- id = 127163
+- parent_id = 127163
 - 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 42c71562f8..82b629282b 100644
--- a/datasets/GM0736_de_ronde_venen/graph_values.yml
+++ b/datasets/GM0736_de_ronde_venen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.137318306
+  max_demand: 137.31831
 energy_production_oily_biomass:
-  max_demand: 0.026768611
+  max_demand: 26.76861
 energy_production_wet_biomass:
-  max_demand: 0.397282392
+  max_demand: 397.28239
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad b/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad
index 2da6ed2fad..b71dca1746 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 = 126920
-- parent_id = 126920
+- id = 127369
+- parent_id = 127369
 - 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 f6a2ebe7c8..65a6a56a11 100644
--- a/datasets/GM0737_tytsjerksteradiel/graph_values.yml
+++ b/datasets/GM0737_tytsjerksteradiel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.146339835
+  max_demand: 146.33984
 energy_production_oily_biomass:
-  max_demand: 0.019308347
+  max_demand: 19.30835
 energy_production_wet_biomass:
-  max_demand: 0.461839715
+  max_demand: 461.83972
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0743_asten/GM0743_asten.derived.ad b/datasets/GM0743_asten/GM0743_asten.derived.ad
index ab3fd0c041..06cd36ca0b 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 = 126672
-- parent_id = 126672
+- id = 127121
+- parent_id = 127121
 - 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 2356f7c9f4..01a5fb5cd6 100644
--- a/datasets/GM0743_asten/graph_values.yml
+++ b/datasets/GM0743_asten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.152381229
+  max_demand: 152.38123
 energy_production_oily_biomass:
-  max_demand: 0.010152375
+  max_demand: 10.15238
 energy_production_wet_biomass:
-  max_demand: 0.241764765
+  max_demand: 241.76477
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad b/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad
index 4320c734c6..eccecead6d 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 = 126673
-- parent_id = 126673
+- id = 127122
+- parent_id = 127122
 - 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 57e494c032..c49f331dae 100644
--- a/datasets/GM0744_baarle_nassau/graph_values.yml
+++ b/datasets/GM0744_baarle_nassau/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.067345904
+  max_demand: 67.3459
 energy_production_oily_biomass:
-  max_demand: 0.004159983
+  max_demand: 4.15998
 energy_production_wet_biomass:
-  max_demand: 0.209567004
+  max_demand: 209.567
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 e03bbb3d59..f228eda21c 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 = 126683
-- parent_id = 126683
+- id = 127132
+- parent_id = 127132
 - 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 be5dbc31b3..987a6955ad 100644
--- a/datasets/GM0748_bergen_op_zoom/graph_values.yml
+++ b/datasets/GM0748_bergen_op_zoom/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.197323576
+  max_demand: 197.32358
 energy_production_oily_biomass:
-  max_demand: 0.040591881
+  max_demand: 40.59188
 energy_production_wet_biomass:
-  max_demand: 0.393532235
+  max_demand: 393.53224
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0753_best/GM0753_best.derived.ad b/datasets/GM0753_best/GM0753_best.derived.ad
index 4d86521b84..ad875f0093 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 = 126686
-- parent_id = 126686
+- id = 127135
+- parent_id = 127135
 - 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 029187e224..482b8bd710 100644
--- a/datasets/GM0753_best/graph_values.yml
+++ b/datasets/GM0753_best/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.126497781
+  max_demand: 126.49778
 energy_production_oily_biomass:
-  max_demand: 0.018118131
+  max_demand: 18.11813
 energy_production_wet_biomass:
-  max_demand: 0.109654769
+  max_demand: 109.65477
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0755_boekel/GM0755_boekel.derived.ad b/datasets/GM0755_boekel/GM0755_boekel.derived.ad
index b175dea677..cc460712c3 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 = 126693
-- parent_id = 126693
+- id = 127142
+- parent_id = 127142
 - 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 26bb1d8efa..3f62ce5dca 100644
--- a/datasets/GM0755_boekel/graph_values.yml
+++ b/datasets/GM0755_boekel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.063332835
+  max_demand: 63.33284
 energy_production_oily_biomass:
-  max_demand: 0.006432875
+  max_demand: 6.43288
 energy_production_wet_biomass:
-  max_demand: 0.145164499
+  max_demand: 145.1645
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad b/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad
index 4510ac2569..9f935aa933 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 = 126697
-- parent_id = 126697
+- id = 127146
+- parent_id = 127146
 - 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 b90ccb8437..4d36f0a81c 100644
--- a/datasets/GM0757_boxtel/graph_values.yml
+++ b/datasets/GM0757_boxtel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.103611268
+  max_demand: 103.61127
 energy_production_oily_biomass:
-  max_demand: 0.018680735
+  max_demand: 18.68074
 energy_production_wet_biomass:
-  max_demand: 0.175566735
+  max_demand: 175.56674
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0758_breda/GM0758_breda.derived.ad b/datasets/GM0758_breda/GM0758_breda.derived.ad
index 28adc0a137..db770b3da2 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 = 126698
-- parent_id = 126698
+- id = 127147
+- parent_id = 127147
 - 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 e211003cd6..ea96e301bb 100644
--- a/datasets/GM0758_breda/graph_values.yml
+++ b/datasets/GM0758_breda/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.494644198
+  max_demand: 494.6442
 energy_production_oily_biomass:
-  max_demand: 0.111714402
+  max_demand: 111.7144
 energy_production_wet_biomass:
-  max_demand: 0.442136814
+  max_demand: 442.13681
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0762_deurne/GM0762_deurne.derived.ad b/datasets/GM0762_deurne/GM0762_deurne.derived.ad
index c0182741f0..be9606efb7 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 = 126719
-- parent_id = 126719
+- id = 127168
+- parent_id = 127168
 - 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 7439c1f02f..81fc7b9afc 100644
--- a/datasets/GM0762_deurne/graph_values.yml
+++ b/datasets/GM0762_deurne/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.183482185
+  max_demand: 183.48219
 energy_production_oily_biomass:
-  max_demand: 0.019661949
+  max_demand: 19.66195
 energy_production_wet_biomass:
-  max_demand: 0.429564092
+  max_demand: 429.56409
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0765_pekela/GM0765_pekela.derived.ad b/datasets/GM0765_pekela/GM0765_pekela.derived.ad
index ac1599bfcb..8160993bd3 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 = 126867
-- parent_id = 126867
+- id = 127316
+- parent_id = 127316
 - 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 b1a87fbf16..a703cdd0b6 100644
--- a/datasets/GM0765_pekela/graph_values.yml
+++ b/datasets/GM0765_pekela/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.05024792
+  max_demand: 50.24792
 energy_production_oily_biomass:
-  max_demand: 0.007420773
+  max_demand: 7.42077
 energy_production_wet_biomass:
-  max_demand: 0.094469573
+  max_demand: 94.46957
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0766_dongen/GM0766_dongen.derived.ad b/datasets/GM0766_dongen/GM0766_dongen.derived.ad
index 723deb1454..24684a16f8 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 = 126725
-- parent_id = 126725
+- id = 127174
+- parent_id = 127174
 - 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 26a8489272..4fff3e99db 100644
--- a/datasets/GM0766_dongen/graph_values.yml
+++ b/datasets/GM0766_dongen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.07351121
+  max_demand: 73.51121
 energy_production_oily_biomass:
-  max_demand: 0.015827619
+  max_demand: 15.82762
 energy_production_wet_biomass:
-  max_demand: 0.120900882
+  max_demand: 120.90088
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0770_eersel/GM0770_eersel.derived.ad b/datasets/GM0770_eersel/GM0770_eersel.derived.ad
index cf139440e5..445252bdfe 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 = 126736
-- parent_id = 126736
+- id = 127185
+- parent_id = 127185
 - 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 5c20088cde..554366665f 100644
--- a/datasets/GM0770_eersel/graph_values.yml
+++ b/datasets/GM0770_eersel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.148804863
+  max_demand: 148.80486
 energy_production_oily_biomass:
-  max_demand: 0.011610526
+  max_demand: 11.61053
 energy_production_wet_biomass:
-  max_demand: 0.244050611
+  max_demand: 244.05061
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad b/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad
index 6c18cdf595..a1722bd0b1 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 = 126738
-- parent_id = 126738
+- id = 127187
+- parent_id = 127187
 - 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 a71e71b348..37270c27b8 100644
--- a/datasets/GM0772_eindhoven/graph_values.yml
+++ b/datasets/GM0772_eindhoven/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.614950744
+  max_demand: 614.95074
 energy_production_oily_biomass:
-  max_demand: 0.140737071
+  max_demand: 140.73707
 energy_production_wet_biomass:
-  max_demand: 0.402680141
+  max_demand: 402.68014
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad b/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad
index 17d7214e5b..dd0ec2a32c 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 = 126745
-- parent_id = 126745
+- id = 127194
+- parent_id = 127194
 - 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 91adfb0ed2..c1e5ed0a9a 100644
--- a/datasets/GM0777_etten_leur/graph_values.yml
+++ b/datasets/GM0777_etten_leur/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.126622679
+  max_demand: 126.62268
 energy_production_oily_biomass:
-  max_demand: 0.026595456
+  max_demand: 26.59546
 energy_production_wet_biomass:
-  max_demand: 0.169810439
+  max_demand: 169.81044
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad b/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad
index 8ee5d48843..fe7177a018 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 = 126746
-- parent_id = 126746
+- id = 127195
+- parent_id = 127195
 - 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 32894c47a3..61cb2428d9 100644
--- a/datasets/GM0779_geertruidenberg/graph_values.yml
+++ b/datasets/GM0779_geertruidenberg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.086890726
+  max_demand: 86.89073
 energy_production_oily_biomass:
-  max_demand: 0.013071714
+  max_demand: 13.07171
 energy_production_wet_biomass:
-  max_demand: 0.116463282
+  max_demand: 116.46328
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 bec7ad2c94..d81349bd0b 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 = 126750
-- parent_id = 126750
+- id = 127199
+- parent_id = 127199
 - 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 4e9f97884e..a38ac93e24 100644
--- a/datasets/GM0784_gilze_en_rijen/graph_values.yml
+++ b/datasets/GM0784_gilze_en_rijen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.119896365
+  max_demand: 119.89637
 energy_production_oily_biomass:
-  max_demand: 0.016058493
+  max_demand: 16.05849
 energy_production_wet_biomass:
-  max_demand: 0.163312125
+  max_demand: 163.31213
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0785_goirle/GM0785_goirle.derived.ad b/datasets/GM0785_goirle/GM0785_goirle.derived.ad
index 1c6aa9a95f..1ffcff2669 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 = 126753
-- parent_id = 126753
+- id = 127202
+- parent_id = 127202
 - 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 140c48ebf7..eaf94710db 100644
--- a/datasets/GM0785_goirle/graph_values.yml
+++ b/datasets/GM0785_goirle/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.090162339
+  max_demand: 90.16234
 energy_production_oily_biomass:
-  max_demand: 0.014455743
+  max_demand: 14.45574
 energy_production_wet_biomass:
-  max_demand: 0.112699652
+  max_demand: 112.69965
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0794_helmond/GM0794_helmond.derived.ad b/datasets/GM0794_helmond/GM0794_helmond.derived.ad
index d6b4f4ca45..fe19d17cc8 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 = 126776
-- parent_id = 126776
+- id = 127225
+- parent_id = 127225
 - 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 df3c212458..318b882db6 100644
--- a/datasets/GM0794_helmond/graph_values.yml
+++ b/datasets/GM0794_helmond/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.252590168
+  max_demand: 252.59017
 energy_production_oily_biomass:
-  max_demand: 0.055606581
+  max_demand: 55.60658
 energy_production_wet_biomass:
-  max_demand: 0.198090987
+  max_demand: 198.09099
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
@@ -1141,7 +1141,7 @@ industry_final_demand_for_metal_electricity-industry_final_demand_for_metal_stee
 industry_final_demand_for_metal_network_gas-industry_final_demand_for_metal_aluminium_network_gas@network_gas:
   parent_share: 0.3965722034477919
 industry_final_demand_for_metal_network_gas-industry_final_demand_for_metal_steel_network_gas@network_gas:
-  parent_share: 0.6034277965522081
+  parent_share: 0.603427796552208
 industry_final_demand_for_metal_steam_hot_water-industry_final_demand_for_metal_steel_steam_hot_water@steam_hot_water:
   parent_share: 1.0
 industry_final_demand_for_metal_steel_coal-industry_steel_blastfurnace_bof@coal:
diff --git a/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad b/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad
index 66c7540d14..7956de738c 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 = 126892
-- parent_id = 126892
+- id = 127341
+- parent_id = 127341
 - 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 f70392b66a..33dbef5329 100644
--- a/datasets/GM0796_s_hertogenbosch/graph_values.yml
+++ b/datasets/GM0796_s_hertogenbosch/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.426963214
+  max_demand: 426.96321
 energy_production_oily_biomass:
-  max_demand: 0.093689227
+  max_demand: 93.68923
 energy_production_wet_biomass:
-  max_demand: 0.472277602
+  max_demand: 472.2776
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0797_heusden/GM0797_heusden.derived.ad b/datasets/GM0797_heusden/GM0797_heusden.derived.ad
index dfd5b4628b..79c8a20fdd 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 = 126780
-- parent_id = 126780
+- id = 127229
+- parent_id = 127229
 - 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 1bbf30a56d..f8017d84c1 100644
--- a/datasets/GM0797_heusden/graph_values.yml
+++ b/datasets/GM0797_heusden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.147775615
+  max_demand: 147.77562
 energy_production_oily_biomass:
-  max_demand: 0.026814786
+  max_demand: 26.81479
 energy_production_wet_biomass:
-  max_demand: 0.181275855
+  max_demand: 181.27586
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad b/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad
index 53852477ac..70426357f8 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 = 126782
-- parent_id = 126782
+- id = 127231
+- parent_id = 127231
 - 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 c78e3e0fb4..c6adf9a5ea 100644
--- a/datasets/GM0798_hilvarenbeek/graph_values.yml
+++ b/datasets/GM0798_hilvarenbeek/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.103627093
+  max_demand: 103.62709
 energy_production_oily_biomass:
-  max_demand: 0.009316369
+  max_demand: 9.31637
 energy_production_wet_biomass:
-  max_demand: 0.318382809
+  max_demand: 318.38281
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 af394872a3..d9c99e7534 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 = 126816
-- parent_id = 126816
+- id = 127265
+- parent_id = 127265
 - 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 a19c53ea9e..b544a4d653 100644
--- a/datasets/GM0809_loon_op_zand/graph_values.yml
+++ b/datasets/GM0809_loon_op_zand/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.090596401
+  max_demand: 90.5964
 energy_production_oily_biomass:
-  max_demand: 0.014172618
+  max_demand: 14.17262
 energy_production_wet_biomass:
-  max_demand: 0.09435675
+  max_demand: 94.35675
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 185de182fe..edb6fc1cdd 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 = 126844
-- parent_id = 126844
+- id = 127293
+- parent_id = 127293
 - 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 8156fb718e..8819645307 100644
--- a/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml
+++ b/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.054748603
+  max_demand: 54.7486
 energy_production_oily_biomass:
-  max_demand: 0.014086952
+  max_demand: 14.08695
 energy_production_wet_biomass:
-  max_demand: 0.034908809
+  max_demand: 34.90881
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad b/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad
index 0b25cace25..f114160d6c 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 = 126847
-- parent_id = 126847
+- id = 127296
+- parent_id = 127296
 - 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 15b2914e97..9f18be0218 100644
--- a/datasets/GM0823_oirschot/graph_values.yml
+++ b/datasets/GM0823_oirschot/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.150189256
+  max_demand: 150.18926
 energy_production_oily_biomass:
-  max_demand: 0.011314643
+  max_demand: 11.31464
 energy_production_wet_biomass:
-  max_demand: 0.241045416
+  max_demand: 241.04542
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad b/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad
index a612a5c23a..09676cd265 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 = 126848
-- parent_id = 126848
+- id = 127297
+- parent_id = 127297
 - 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 44c006e0d6..df4bc99804 100644
--- a/datasets/GM0824_oisterwijk/graph_values.yml
+++ b/datasets/GM0824_oisterwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.107234946
+  max_demand: 107.23495
 energy_production_oily_biomass:
-  max_demand: 0.015881693
+  max_demand: 15.88169
 energy_production_wet_biomass:
-  max_demand: 0.186224208
+  max_demand: 186.22421
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad b/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad
index fd9c21aa2e..0153dd74ba 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 = 126855
-- parent_id = 126855
+- id = 127304
+- parent_id = 127304
 - 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 2c0b089d76..7701b09c26 100644
--- a/datasets/GM0826_oosterhout/graph_values.yml
+++ b/datasets/GM0826_oosterhout/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.174947453
+  max_demand: 174.94745
 energy_production_oily_biomass:
-  max_demand: 0.033790215
+  max_demand: 33.79022
 energy_production_wet_biomass:
-  max_demand: 0.202387449
+  max_demand: 202.38745
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0828_oss/GM0828_oss.derived.ad b/datasets/GM0828_oss/GM0828_oss.derived.ad
index 2eee86454f..adb9d24ce8 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 = 126860
-- parent_id = 126860
+- id = 127309
+- parent_id = 127309
 - 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 9b9686834d..ccc8216339 100644
--- a/datasets/GM0828_oss/graph_values.yml
+++ b/datasets/GM0828_oss/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.309455363
+  max_demand: 309.45536
 energy_production_oily_biomass:
-  max_demand: 0.055562229
+  max_demand: 55.56223
 energy_production_wet_biomass:
-  max_demand: 0.519908262
+  max_demand: 519.90826
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad b/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad
index a539f5a45c..7f593c127b 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 = 126886
-- parent_id = 126886
+- id = 127335
+- parent_id = 127335
 - 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 93f80f4484..14b7ae03e0 100644
--- a/datasets/GM0840_rucphen/graph_values.yml
+++ b/datasets/GM0840_rucphen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.079790496
+  max_demand: 79.7905
 energy_production_oily_biomass:
-  max_demand: 0.013713908
+  max_demand: 13.71391
 energy_production_wet_biomass:
-  max_demand: 0.15202212
+  max_demand: 152.02212
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad b/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad
index 94dc823803..cf2cd2e893 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 = 126894
-- parent_id = 126894
+- id = 127343
+- parent_id = 127343
 - 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 2a5a6e93c9..ca7afa6467 100644
--- a/datasets/GM0845_sint_michielsgestel/graph_values.yml
+++ b/datasets/GM0845_sint_michielsgestel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.095095365
+  max_demand: 95.09537
 energy_production_oily_biomass:
-  max_demand: 0.017613854
+  max_demand: 17.61385
 energy_production_wet_biomass:
-  max_demand: 0.156102604
+  max_demand: 156.1026
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0847_someren/GM0847_someren.derived.ad b/datasets/GM0847_someren/GM0847_someren.derived.ad
index 6ad072cf88..093b125296 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 = 126900
-- parent_id = 126900
+- id = 127349
+- parent_id = 127349
 - 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 b2ac74a1c4..5ff5b77727 100644
--- a/datasets/GM0847_someren/graph_values.yml
+++ b/datasets/GM0847_someren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.261759943
+  max_demand: 261.75994
 energy_production_oily_biomass:
-  max_demand: 0.011739329
+  max_demand: 11.73933
 energy_production_wet_biomass:
-  max_demand: 0.239660649
+  max_demand: 239.66065
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 9089da3a15..2724b42356 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 = 126901
-- parent_id = 126901
+- id = 127350
+- parent_id = 127350
 - 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 bada6fa477..3b151b3416 100644
--- a/datasets/GM0848_son_en_breugel/graph_values.yml
+++ b/datasets/GM0848_son_en_breugel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.079455236
+  max_demand: 79.45524
 energy_production_oily_biomass:
-  max_demand: 0.010270242
+  max_demand: 10.27024
 energy_production_wet_biomass:
-  max_demand: 0.055410538
+  max_demand: 55.41054
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad b/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad
index 60ec5f8ce0..f50a4f7797 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 = 126905
-- parent_id = 126905
+- id = 127354
+- parent_id = 127354
 - 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 c0f08d993e..91d363f837 100644
--- a/datasets/GM0851_steenbergen/graph_values.yml
+++ b/datasets/GM0851_steenbergen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.128468934
+  max_demand: 128.46893
 energy_production_oily_biomass:
-  max_demand: 0.015221879
+  max_demand: 15.22188
 energy_production_wet_biomass:
-  max_demand: 0.541881523
+  max_demand: 541.88152
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0852_waterland/GM0852_waterland.derived.ad b/datasets/GM0852_waterland/GM0852_waterland.derived.ad
index 415c09c345..c3459627e9 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 = 126948
-- parent_id = 126948
+- id = 127397
+- parent_id = 127397
 - 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 80efff26a8..b2a9fb046d 100644
--- a/datasets/GM0852_waterland/graph_values.yml
+++ b/datasets/GM0852_waterland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.054282244
+  max_demand: 54.28224
 energy_production_oily_biomass:
-  max_demand: 0.010519951
+  max_demand: 10.51995
 energy_production_wet_biomass:
-  max_demand: 0.140706247
+  max_demand: 140.70625
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad b/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad
index b12a63d2a5..08ddaee319 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 = 126916
-- parent_id = 126916
+- id = 127365
+- parent_id = 127365
 - 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 93a8c5860f..c6cbd301f9 100644
--- a/datasets/GM0855_tilburg/graph_values.yml
+++ b/datasets/GM0855_tilburg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.590961376
+  max_demand: 590.96138
 energy_production_oily_biomass:
-  max_demand: 0.131998495
+  max_demand: 131.9985
 energy_production_wet_biomass:
-  max_demand: 0.4558517
+  max_demand: 455.8517
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad b/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad
index 00c88dbc43..fa05bc9c76 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 = 126928
-- parent_id = 126928
+- id = 127377
+- parent_id = 127377
 - 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 c20b74449d..300afd93f3 100644
--- a/datasets/GM0858_valkenswaard/graph_values.yml
+++ b/datasets/GM0858_valkenswaard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.101727037
+  max_demand: 101.72704
 energy_production_oily_biomass:
-  max_demand: 0.018779767
+  max_demand: 18.77977
 energy_production_wet_biomass:
-  max_demand: 0.144835058
+  max_demand: 144.83506
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad b/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad
index 4425351bab..491f21d372 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 = 126932
-- parent_id = 126932
+- id = 127381
+- parent_id = 127381
 - 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 d39864f605..15f6317634 100644
--- a/datasets/GM0861_veldhoven/graph_values.yml
+++ b/datasets/GM0861_veldhoven/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.126056907
+  max_demand: 126.05691
 energy_production_oily_biomass:
-  max_demand: 0.027545076
+  max_demand: 27.54508
 energy_production_wet_biomass:
-  max_demand: 0.100344707
+  max_demand: 100.34471
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0865_vught/GM0865_vught.derived.ad b/datasets/GM0865_vught/GM0865_vught.derived.ad
index 7b3bb5f76d..c4f22853ef 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 = 126942
-- parent_id = 126942
+- id = 127391
+- parent_id = 127391
 - 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 96ef02d548..6ac8556985 100644
--- a/datasets/GM0865_vught/graph_values.yml
+++ b/datasets/GM0865_vught/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.0781498
+  max_demand: 78.1498
 energy_production_oily_biomass:
-  max_demand: 0.016037229
+  max_demand: 16.03723
 energy_production_wet_biomass:
-  max_demand: 0.07672848
+  max_demand: 76.72848
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0866_waalre/GM0866_waalre.derived.ad b/datasets/GM0866_waalre/GM0866_waalre.derived.ad
index 85b49413a0..5fc85026d0 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 = 126943
-- parent_id = 126943
+- id = 127392
+- parent_id = 127392
 - 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 b66162b95f..5f3df57709 100644
--- a/datasets/GM0866_waalre/graph_values.yml
+++ b/datasets/GM0866_waalre/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.053053438
+  max_demand: 53.05344
 energy_production_oily_biomass:
-  max_demand: 0.010478636
+  max_demand: 10.47864
 energy_production_wet_biomass:
-  max_demand: 0.051594358
+  max_demand: 51.59436
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad b/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad
index bac2a81186..ca0fb5c62f 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 = 126944
-- parent_id = 126944
+- id = 127393
+- parent_id = 127393
 - 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 9e7fbc5348..b2e1fddc31 100644
--- a/datasets/GM0867_waalwijk/graph_values.yml
+++ b/datasets/GM0867_waalwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.135021927
+  max_demand: 135.02193
 energy_production_oily_biomass:
-  max_demand: 0.029308831
+  max_demand: 29.30883
 energy_production_wet_biomass:
-  max_demand: 0.164096693
+  max_demand: 164.09669
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad b/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad
index 85df7d3a05..eb95b8d4f6 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 = 126960
-- parent_id = 126960
+- id = 127409
+- parent_id = 127409
 - 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 a4bd43a1fa..2baaf3defc 100644
--- a/datasets/GM0873_woensdrecht/graph_values.yml
+++ b/datasets/GM0873_woensdrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.105113501
+  max_demand: 105.1135
 energy_production_oily_biomass:
-  max_demand: 0.013284969
+  max_demand: 13.28497
 energy_production_wet_biomass:
-  max_demand: 0.210724924
+  max_demand: 210.72492
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0879_zundert/GM0879_zundert.derived.ad b/datasets/GM0879_zundert/GM0879_zundert.derived.ad
index e66661ddcb..8142c14a35 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 = 126973
-- parent_id = 126973
+- id = 127422
+- parent_id = 127422
 - 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 313cbddf74..6fbf66cb54 100644
--- a/datasets/GM0879_zundert/graph_values.yml
+++ b/datasets/GM0879_zundert/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.131171033
+  max_demand: 131.17103
 energy_production_oily_biomass:
-  max_demand: 0.013130648
+  max_demand: 13.13065
 energy_production_wet_biomass:
-  max_demand: 0.237909868
+  max_demand: 237.90987
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad b/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad
index 49099a2b5b..a6fa84e2a5 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 = 126962
-- parent_id = 126962
+- id = 127411
+- parent_id = 127411
 - 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 83cc420040..cced4afb04 100644
--- a/datasets/GM0880_wormerland/graph_values.yml
+++ b/datasets/GM0880_wormerland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.048548529
+  max_demand: 48.54853
 energy_production_oily_biomass:
-  max_demand: 0.009920894
+  max_demand: 9.92089
 energy_production_wet_biomass:
-  max_demand: 0.144833613
+  max_demand: 144.83361
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad b/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad
index 09f14c9089..63e92bc523 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 = 126802
-- parent_id = 126802
+- id = 127251
+- parent_id = 127251
 - 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 1e34bcf6be..0f020b292f 100644
--- a/datasets/GM0882_landgraaf/graph_values.yml
+++ b/datasets/GM0882_landgraaf/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.106601089
+  max_demand: 106.60109
 energy_production_oily_biomass:
-  max_demand: 0.022838895
+  max_demand: 22.8389
 energy_production_wet_biomass:
-  max_demand: 0.070357422
+  max_demand: 70.35742
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0888_beek/GM0888_beek.derived.ad b/datasets/GM0888_beek/GM0888_beek.derived.ad
index bd91da481a..285bbcab16 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 = 126677
-- parent_id = 126677
+- id = 127126
+- parent_id = 127126
 - 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 ac5f0fab8d..cb1e821860 100644
--- a/datasets/GM0888_beek/graph_values.yml
+++ b/datasets/GM0888_beek/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.045229136
+  max_demand: 45.22914
 energy_production_oily_biomass:
-  max_demand: 0.009677868
+  max_demand: 9.67787
 energy_production_wet_biomass:
-  max_demand: 0.046394812
+  max_demand: 46.39481
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0889_beesel/GM0889_beesel.derived.ad b/datasets/GM0889_beesel/GM0889_beesel.derived.ad
index 8286e76dde..716fe93236 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 = 126678
-- parent_id = 126678
+- id = 127127
+- parent_id = 127127
 - 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 1a95494bc6..8b32390fbc 100644
--- a/datasets/GM0889_beesel/graph_values.yml
+++ b/datasets/GM0889_beesel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.043796327
+  max_demand: 43.79633
 energy_production_oily_biomass:
-  max_demand: 0.008213642
+  max_demand: 8.21364
 energy_production_wet_biomass:
-  max_demand: 0.064245334
+  max_demand: 64.24533
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0893_bergen/GM0893_bergen.derived.ad b/datasets/GM0893_bergen/GM0893_bergen.derived.ad
index d4e6daff26..4c9d8e45b3 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 = 126681
-- parent_id = 126681
+- id = 127130
+- parent_id = 127130
 - 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 2c63acaa0c..959ac8a067 100644
--- a/datasets/GM0893_bergen/graph_values.yml
+++ b/datasets/GM0893_bergen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.078750261
+  max_demand: 78.75026
 energy_production_oily_biomass:
-  max_demand: 0.007983376
+  max_demand: 7.98338
 energy_production_wet_biomass:
-  max_demand: 0.198580026
+  max_demand: 198.58003
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad b/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad
index 975b81e258..c45a5bf78a 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 = 126701
-- parent_id = 126701
+- id = 127150
+- parent_id = 127150
 - 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 3dc3b459ca..802bd0546b 100644
--- a/datasets/GM0899_brunssum/graph_values.yml
+++ b/datasets/GM0899_brunssum/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.075994737
+  max_demand: 75.99474
 energy_production_oily_biomass:
-  max_demand: 0.017074338
+  max_demand: 17.07434
 energy_production_wet_biomass:
-  max_demand: 0.0496528
+  max_demand: 49.6528
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0907_gennep/GM0907_gennep.derived.ad b/datasets/GM0907_gennep/GM0907_gennep.derived.ad
index 889fdfa736..dafda1a72b 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 = 126749
-- parent_id = 126749
+- id = 127198
+- parent_id = 127198
 - 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 95c11cdd7e..ab3c60c49a 100644
--- a/datasets/GM0907_gennep/graph_values.yml
+++ b/datasets/GM0907_gennep/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.081326858
+  max_demand: 81.32686
 energy_production_oily_biomass:
-  max_demand: 0.010371705
+  max_demand: 10.37171
 energy_production_wet_biomass:
-  max_demand: 0.10980504
+  max_demand: 109.80504
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad b/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad
index 6e5f4e2059..07fb016cdc 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 = 126772
-- parent_id = 126772
+- id = 127221
+- parent_id = 127221
 - 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 0d7e7122c8..113f6bbde2 100644
--- a/datasets/GM0917_heerlen/graph_values.yml
+++ b/datasets/GM0917_heerlen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.258561995
+  max_demand: 258.562
 energy_production_oily_biomass:
-  max_demand: 0.052755896
+  max_demand: 52.7559
 energy_production_wet_biomass:
-  max_demand: 0.160563183
+  max_demand: 160.56318
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad b/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad
index cb6abb0bb7..9c6ba98c7c 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 = 126797
-- parent_id = 126797
+- id = 127246
+- parent_id = 127246
 - 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 b63538aec1..d80451fd1c 100644
--- a/datasets/GM0928_kerkrade/graph_values.yml
+++ b/datasets/GM0928_kerkrade/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.127466626
+  max_demand: 127.46663
 energy_production_oily_biomass:
-  max_demand: 0.027730383
+  max_demand: 27.73038
 energy_production_wet_biomass:
-  max_demand: 0.084247534
+  max_demand: 84.24753
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad b/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad
index 30365dc46c..83f99b861a 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 = 126822
-- parent_id = 126822
+- id = 127271
+- parent_id = 127271
 - 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 8d6417fddd..d0ab245502 100644
--- a/datasets/GM0935_maastricht/graph_values.yml
+++ b/datasets/GM0935_maastricht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.327027215
+  max_demand: 327.02722
 energy_production_oily_biomass:
-  max_demand: 0.073858376
+  max_demand: 73.85838
 energy_production_wet_biomass:
-  max_demand: 0.237456162
+  max_demand: 237.45616
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad b/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad
index 746d6d10bd..9d1a526fa0 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 = 126824
-- parent_id = 126824
+- id = 127273
+- parent_id = 127273
 - 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 80353d7944..d6a930463d 100644
--- a/datasets/GM0938_meerssen/graph_values.yml
+++ b/datasets/GM0938_meerssen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.057888067
+  max_demand: 57.88807
 energy_production_oily_biomass:
-  max_demand: 0.011496912
+  max_demand: 11.49691
 energy_production_wet_biomass:
-  max_demand: 0.053624922
+  max_demand: 53.62492
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 af2e495515..e065f3296b 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 = 126832
-- parent_id = 126832
+- id = 127281
+- parent_id = 127281
 - 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 8367dac137..b4a5d2f279 100644
--- a/datasets/GM0944_mook_en_middelaar/graph_values.yml
+++ b/datasets/GM0944_mook_en_middelaar/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.027256444
+  max_demand: 27.25644
 energy_production_oily_biomass:
-  max_demand: 0.004742636
+  max_demand: 4.74264
 energy_production_wet_biomass:
-  max_demand: 0.036985531
+  max_demand: 36.98553
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad b/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad
index e5a2285b85..d86e029284 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 = 126834
-- parent_id = 126834
+- id = 127283
+- parent_id = 127283
 - 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 16114f7b22..75adfe61b9 100644
--- a/datasets/GM0946_nederweert/graph_values.yml
+++ b/datasets/GM0946_nederweert/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.291239203
+  max_demand: 291.2392
 energy_production_oily_biomass:
-  max_demand: 0.010329176
+  max_demand: 10.32918
 energy_production_wet_biomass:
-  max_demand: 0.355909417
+  max_demand: 355.90942
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0957_roermond/GM0957_roermond.derived.ad b/datasets/GM0957_roermond/GM0957_roermond.derived.ad
index 61906b7b75..c65a20ccf8 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 = 126882
-- parent_id = 126882
+- id = 127331
+- parent_id = 127331
 - 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 2572ce518a..65798c4751 100644
--- a/datasets/GM0957_roermond/graph_values.yml
+++ b/datasets/GM0957_roermond/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.171427169
+  max_demand: 171.42717
 energy_production_oily_biomass:
-  max_demand: 0.035365625
+  max_demand: 35.36563
 energy_production_wet_biomass:
-  max_demand: 0.210778091
+  max_demand: 210.77809
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad b/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad
index 5fd32d4933..5fb208662f 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 = 126893
-- parent_id = 126893
+- id = 127342
+- parent_id = 127342
 - 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 2424b73c48..cef3d523f8 100644
--- a/datasets/GM0965_simpelveld/graph_values.yml
+++ b/datasets/GM0965_simpelveld/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.033821999
+  max_demand: 33.822
 energy_production_oily_biomass:
-  max_demand: 0.006389131
+  max_demand: 6.38913
 energy_production_wet_biomass:
-  max_demand: 0.041474817
+  max_demand: 41.47482
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0971_stein/GM0971_stein.derived.ad b/datasets/GM0971_stein/GM0971_stein.derived.ad
index e4d91ef09d..679db3822f 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 = 126907
-- parent_id = 126907
+- id = 127356
+- parent_id = 127356
 - 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 87c3ebbebc..27472dd132 100644
--- a/datasets/GM0971_stein/graph_values.yml
+++ b/datasets/GM0971_stein/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.07369621
+  max_demand: 73.69621
 energy_production_oily_biomass:
-  max_demand: 0.015165376
+  max_demand: 15.16538
 energy_production_wet_biomass:
-  max_demand: 0.065900396
+  max_demand: 65.9004
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0981_vaals/GM0981_vaals.derived.ad b/datasets/GM0981_vaals/GM0981_vaals.derived.ad
index 4163f6d575..b64d8fc96d 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 = 126926
-- parent_id = 126926
+- id = 127375
+- parent_id = 127375
 - 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 7ac3d8e25a..acca08576d 100644
--- a/datasets/GM0981_vaals/graph_values.yml
+++ b/datasets/GM0981_vaals/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.036263486
+  max_demand: 36.26349
 energy_production_oily_biomass:
-  max_demand: 0.006131524
+  max_demand: 6.13152
 energy_production_wet_biomass:
-  max_demand: 0.04009553
+  max_demand: 40.09553
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0983_venlo/GM0983_venlo.derived.ad b/datasets/GM0983_venlo/GM0983_venlo.derived.ad
index 3f95a2383d..11bb319e46 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 = 126934
-- parent_id = 126934
+- id = 127383
+- parent_id = 127383
 - 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 887290303b..30f0099449 100644
--- a/datasets/GM0983_venlo/graph_values.yml
+++ b/datasets/GM0983_venlo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.3123604
+  max_demand: 312.3604
 energy_production_oily_biomass:
-  max_demand: 0.061730207
+  max_demand: 61.73021
 energy_production_wet_biomass:
-  max_demand: 0.279802748
+  max_demand: 279.80275
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0984_venray/GM0984_venray.derived.ad b/datasets/GM0984_venray/GM0984_venray.derived.ad
index a14b511417..585450a253 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 = 126935
-- parent_id = 126935
+- id = 127384
+- parent_id = 127384
 - 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 ee3e01594c..878bad32a8 100644
--- a/datasets/GM0984_venray/graph_values.yml
+++ b/datasets/GM0984_venray/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.429712936
+  max_demand: 429.71294
 energy_production_oily_biomass:
-  max_demand: 0.026323268
+  max_demand: 26.32327
 energy_production_wet_biomass:
-  max_demand: 0.592959089
+  max_demand: 592.95909
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad b/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad
index 5b079b8357..6d91c8f81f 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 = 126939
-- parent_id = 126939
+- id = 127388
+- parent_id = 127388
 - 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 9d856cbd37..53112ba523 100644
--- a/datasets/GM0986_voerendaal/graph_values.yml
+++ b/datasets/GM0986_voerendaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.044668047
+  max_demand: 44.66805
 energy_production_oily_biomass:
-  max_demand: 0.007565372
+  max_demand: 7.56537
 energy_production_wet_biomass:
-  max_demand: 0.061085542
+  max_demand: 61.08554
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0988_weert/GM0988_weert.derived.ad b/datasets/GM0988_weert/GM0988_weert.derived.ad
index d035fb45f0..64e67e649d 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 = 126949
-- parent_id = 126949
+- id = 127398
+- parent_id = 127398
 - 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 883a8747fe..38605f7da5 100644
--- a/datasets/GM0988_weert/graph_values.yml
+++ b/datasets/GM0988_weert/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.289103276
+  max_demand: 289.10328
 energy_production_oily_biomass:
-  max_demand: 0.030282147
+  max_demand: 30.28215
 energy_production_wet_biomass:
-  max_demand: 0.25418874
+  max_demand: 254.18874
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 af5fb5061c..f7cd4e993e 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 = 126927
-- parent_id = 126927
+- id = 127376
+- parent_id = 127376
 - 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 4475483448..f6a079056b 100644
--- a/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml
+++ b/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.058214597
+  max_demand: 58.2146
 energy_production_oily_biomass:
-  max_demand: 0.01000656
+  max_demand: 10.00656
 energy_production_wet_biomass:
-  max_demand: 0.071673739
+  max_demand: 71.67374
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad b/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad
index 88d93283a0..d77e552e5a 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 = 126810
-- parent_id = 126810
+- id = 127259
+- parent_id = 127259
 - 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 9d794399bf..e2eb711779 100644
--- a/datasets/GM0995_lelystad/graph_values.yml
+++ b/datasets/GM0995_lelystad/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.328689837
+  max_demand: 328.68984
 energy_production_oily_biomass:
-  max_demand: 0.047324892
+  max_demand: 47.32489
 energy_production_wet_biomass:
-  max_demand: 1.191203527
+  max_demand: 1191.20353
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 c79b9320a2..d556d48b2f 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 = 126788
-- parent_id = 126788
+- id = 127237
+- parent_id = 127237
 - 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 818f06bf69..ed86ca3f6b 100644
--- a/datasets/GM1507_horst_aan_de_maas/graph_values.yml
+++ b/datasets/GM1507_horst_aan_de_maas/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.250390729
+  max_demand: 250.39073
 energy_production_oily_biomass:
-  max_demand: 0.02569444
+  max_demand: 25.69444
 energy_production_wet_biomass:
-  max_demand: 0.44179165
+  max_demand: 441.79165
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad b/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad
index e0608763a4..c21607e010 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 = 126861
-- parent_id = 126861
+- id = 127310
+- parent_id = 127310
 - 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 23e7c382e6..a93e82172a 100644
--- a/datasets/GM1509_oude_ijsselstreek/graph_values.yml
+++ b/datasets/GM1509_oude_ijsselstreek/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.159965001
+  max_demand: 159.965
 energy_production_oily_biomass:
-  max_demand: 0.023982328
+  max_demand: 23.98233
 energy_production_wet_biomass:
-  max_demand: 0.31358553
+  max_demand: 313.58553
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad b/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad
index 7404654b22..44dcb3a022 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 = 126913
-- parent_id = 126913
+- id = 127362
+- parent_id = 127362
 - 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 ac6ff9ebf9..2c5e4e107d 100644
--- a/datasets/GM1525_teylingen/graph_values.yml
+++ b/datasets/GM1525_teylingen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.096413925
+  max_demand: 96.41393
 energy_production_oily_biomass:
-  max_demand: 0.022516886
+  max_demand: 22.51689
 energy_production_wet_biomass:
-  max_demand: 0.131915671
+  max_demand: 131.91567
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad b/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad
index ffc58b99a5..39ceb826f2 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 = 126925
-- parent_id = 126925
+- id = 127374
+- parent_id = 127374
 - 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 99b12e8773..ab12fcdefd 100644
--- a/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml
+++ b/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.217775931
+  max_demand: 217.77593
 energy_production_oily_biomass:
-  max_demand: 0.030083474
+  max_demand: 30.08347
 energy_production_wet_biomass:
-  max_demand: 0.239002295
+  max_demand: 239.0023
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad b/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad
index 37563ea218..0d470fa014 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 = 126854
-- parent_id = 126854
+- id = 127303
+- parent_id = 127303
 - 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 837d51490a..208a056751 100644
--- a/datasets/GM1586_oost_gelre/graph_values.yml
+++ b/datasets/GM1586_oost_gelre/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.175648117
+  max_demand: 175.64812
 energy_production_oily_biomass:
-  max_demand: 0.018047047
+  max_demand: 18.04705
 energy_production_wet_biomass:
-  max_demand: 0.33199944
+  max_demand: 331.99944
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad b/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad
index af68911913..b3a90efa48 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 = 126798
-- parent_id = 126798
+- id = 127247
+- parent_id = 127247
 - 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 c4c50f10d2..6fe9dc74b3 100644
--- a/datasets/GM1598_koggenland/graph_values.yml
+++ b/datasets/GM1598_koggenland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.076284793
+  max_demand: 76.28479
 energy_production_oily_biomass:
-  max_demand: 0.013814764
+  max_demand: 13.81476
 energy_production_wet_biomass:
-  max_demand: 0.234312673
+  max_demand: 234.31267
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad b/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad
index f6326ccb91..a55b5bf6d4 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 = 126804
-- parent_id = 126804
+- id = 127253
+- parent_id = 127253
 - 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 2642f8468d..410d3af7db 100644
--- a/datasets/GM1621_lansingerland/graph_values.yml
+++ b/datasets/GM1621_lansingerland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.16405134
+  max_demand: 164.05134
 energy_production_oily_biomass:
-  max_demand: 0.037426478
+  max_demand: 37.42648
 energy_production_wet_biomass:
-  max_demand: 0.157113565
+  max_demand: 157.11357
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1640_leudal/GM1640_leudal.derived.ad b/datasets/GM1640_leudal/GM1640_leudal.derived.ad
index c58da10c17..881410d35d 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 = 126811
-- parent_id = 126811
+- id = 127260
+- parent_id = 127260
 - 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 7bd62cf108..6a1d9762a4 100644
--- a/datasets/GM1640_leudal/graph_values.yml
+++ b/datasets/GM1640_leudal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.350586815
+  max_demand: 350.58682
 energy_production_oily_biomass:
-  max_demand: 0.02167845
+  max_demand: 21.67845
 energy_production_wet_biomass:
-  max_demand: 0.516290127
+  max_demand: 516.29013
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad b/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad
index dfe2f42ce1..79aa54cb26 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 = 126820
-- parent_id = 126820
+- id = 127269
+- parent_id = 127269
 - 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 62ae8ef69a..63137cdc25 100644
--- a/datasets/GM1641_maasgouw/graph_values.yml
+++ b/datasets/GM1641_maasgouw/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.077318436
+  max_demand: 77.31844
 energy_production_oily_biomass:
-  max_demand: 0.01440896
+  max_demand: 14.40896
 energy_production_wet_biomass:
-  max_demand: 0.181618552
+  max_demand: 181.61855
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad b/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad
index 55193828cc..2307b53e8f 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 = 126748
-- parent_id = 126748
+- id = 127197
+- parent_id = 127197
 - 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 42a717e11e..8ecff87adf 100644
--- a/datasets/GM1652_gemert_bakel/graph_values.yml
+++ b/datasets/GM1652_gemert_bakel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.202654158
+  max_demand: 202.65416
 energy_production_oily_biomass:
-  max_demand: 0.018498466
+  max_demand: 18.49847
 energy_production_wet_biomass:
-  max_demand: 0.407996982
+  max_demand: 407.99698
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad b/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad
index f512f6dc3b..b0d140c0d9 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 = 126762
-- parent_id = 126762
+- id = 127211
+- parent_id = 127211
 - 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 8a1124d694..4c374a8ec5 100644
--- a/datasets/GM1655_halderberge/graph_values.yml
+++ b/datasets/GM1655_halderberge/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.104187797
+  max_demand: 104.1878
 energy_production_oily_biomass:
-  max_demand: 0.018344752
+  max_demand: 18.34475
 energy_production_wet_biomass:
-  max_demand: 0.247417519
+  max_demand: 247.41752
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad b/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad
index 2f4b9c21e2..19c99da9b1 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 = 126773
-- parent_id = 126773
+- id = 127222
+- parent_id = 127222
 - 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 f618d09907..cc5846ae59 100644
--- a/datasets/GM1658_heeze_leende/graph_values.yml
+++ b/datasets/GM1658_heeze_leende/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.127966843
+  max_demand: 127.96684
 energy_production_oily_biomass:
-  max_demand: 0.009699133
+  max_demand: 9.69913
 energy_production_wet_biomass:
-  max_demand: 0.206425222
+  max_demand: 206.42522
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad b/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad
index 278e7b0938..42106bd6e5 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 = 126801
-- parent_id = 126801
+- id = 127250
+- parent_id = 127250
 - 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 4e357d99f2..616fdd54fc 100644
--- a/datasets/GM1659_laarbeek/graph_values.yml
+++ b/datasets/GM1659_laarbeek/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.101942701
+  max_demand: 101.9427
 energy_production_oily_biomass:
-  max_demand: 0.013568701
+  max_demand: 13.5687
 energy_production_wet_biomass:
-  max_demand: 0.17067015
+  max_demand: 170.67015
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 8f2d9ea552..9d0a1532e8 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 = 126875
-- parent_id = 126875
+- id = 127324
+- parent_id = 127324
 - 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 62932b8c91..6f68d3f4c4 100644
--- a/datasets/GM1667_reusel_de_mierden/graph_values.yml
+++ b/datasets/GM1667_reusel_de_mierden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.103069909
+  max_demand: 103.06991
 energy_production_oily_biomass:
-  max_demand: 0.007934771
+  max_demand: 7.93477
 energy_production_wet_biomass:
-  max_demand: 0.358052818
+  max_demand: 358.05282
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad b/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad
index 2267434920..70007494a1 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 = 126881
-- parent_id = 126881
+- id = 127330
+- parent_id = 127330
 - 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 a85ddf93f6..a1156411de 100644
--- a/datasets/GM1669_roerdalen/graph_values.yml
+++ b/datasets/GM1669_roerdalen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.098585043
+  max_demand: 98.58504
 energy_production_oily_biomass:
-  max_demand: 0.012524908
+  max_demand: 12.52491
 energy_production_wet_biomass:
-  max_demand: 0.158049274
+  max_demand: 158.04927
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad b/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad
index 593594cf6e..32c0202001 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 = 126883
-- parent_id = 126883
+- id = 127332
+- parent_id = 127332
 - 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 7290d973a5..a3dc42dc0f 100644
--- a/datasets/GM1674_roosendaal/graph_values.yml
+++ b/datasets/GM1674_roosendaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.241011952
+  max_demand: 241.01195
 energy_production_oily_biomass:
-  max_demand: 0.046801781
+  max_demand: 46.80178
 energy_production_wet_biomass:
-  max_demand: 0.332230341
+  max_demand: 332.23034
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad b/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad
index a92ad1e541..8808c1c94b 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 = 126891
-- parent_id = 126891
+- id = 127340
+- parent_id = 127340
 - 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 abe09f9f06..940375c555 100644
--- a/datasets/GM1676_schouwen_duiveland/graph_values.yml
+++ b/datasets/GM1676_schouwen_duiveland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.164802215
+  max_demand: 164.80222
 energy_production_oily_biomass:
-  max_demand: 0.020522865
+  max_demand: 20.52287
 energy_production_wet_biomass:
-  max_demand: 0.670233507
+  max_demand: 670.23351
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 c3a07ece5b..a60f2b8202 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 = 126654
-- parent_id = 126654
+- id = 127103
+- parent_id = 127103
 - 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 1b30677d2d..51b734d25c 100644
--- a/datasets/GM1680_aa_en_hunze/graph_values.yml
+++ b/datasets/GM1680_aa_en_hunze/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.206608931
+  max_demand: 206.60893
 energy_production_oily_biomass:
-  max_demand: 0.01542359
+  max_demand: 15.42359
 energy_production_wet_biomass:
-  max_demand: 0.395372289
+  max_demand: 395.37229
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad b/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad
index fcf8e4faf4..49eaaef661 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 = 126694
-- parent_id = 126694
+- id = 127143
+- parent_id = 127143
 - 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 b026e9f5bc..b8651b4522 100644
--- a/datasets/GM1681_borger_odoorn/graph_values.yml
+++ b/datasets/GM1681_borger_odoorn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.266312203
+  max_demand: 266.3122
 energy_production_oily_biomass:
-  max_demand: 0.015415084
+  max_demand: 15.41508
 energy_production_wet_biomass:
-  max_demand: 0.38689829
+  max_demand: 386.89829
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad b/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad
index 7579fad2df..0c2233795f 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 = 126715
-- parent_id = 126715
+- id = 127164
+- parent_id = 127164
 - 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 b94f9f679d..4d89488f69 100644
--- a/datasets/GM1690_de_wolden/graph_values.yml
+++ b/datasets/GM1690_de_wolden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.223271981
+  max_demand: 223.27198
 energy_production_oily_biomass:
-  max_demand: 0.01464834
+  max_demand: 14.64834
 energy_production_wet_biomass:
-  max_demand: 0.391070825
+  max_demand: 391.07083
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad b/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad
index a77206a50d..89111ae3ec 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 = 126840
-- parent_id = 126840
+- id = 127289
+- parent_id = 127289
 - 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 e2f03cc526..4267b19218 100644
--- a/datasets/GM1695_noord_beveland/graph_values.yml
+++ b/datasets/GM1695_noord_beveland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.064005909
+  max_demand: 64.00591
 energy_production_oily_biomass:
-  max_demand: 0.004440069
+  max_demand: 4.44007
 energy_production_wet_biomass:
-  max_demand: 1.404088196
+  max_demand: 1404.0882
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad b/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad
index 7f62ddcafa..3bcddd0fcf 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 = 126957
-- parent_id = 126957
+- id = 127406
+- parent_id = 127406
 - 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 389caef0d6..3c4834ae89 100644
--- a/datasets/GM1696_wijdemeren/graph_values.yml
+++ b/datasets/GM1696_wijdemeren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.075978441
+  max_demand: 75.97844
 energy_production_oily_biomass:
-  max_demand: 0.014589406
+  max_demand: 14.58941
 energy_production_wet_biomass:
-  max_demand: 0.367442974
+  max_demand: 367.44297
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad b/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad
index 3af015cd2b..4b0dc774ba 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 = 126841
-- parent_id = 126841
+- id = 127290
+- parent_id = 127290
 - 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 a9b3866ee7..f6f4842d38 100644
--- a/datasets/GM1699_noordenveld/graph_values.yml
+++ b/datasets/GM1699_noordenveld/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.163510014
+  max_demand: 163.51001
 energy_production_oily_biomass:
-  max_demand: 0.019010641
+  max_demand: 19.01064
 energy_production_wet_biomass:
-  max_demand: 0.468821864
+  max_demand: 468.82186
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad b/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad
index de5d8fe3c6..d950521724 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 = 126918
-- parent_id = 126918
+- id = 127367
+- parent_id = 127367
 - 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 f3ca44abff..3c016e54c9 100644
--- a/datasets/GM1700_twenterand/graph_values.yml
+++ b/datasets/GM1700_twenterand/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.147452932
+  max_demand: 147.45293
 energy_production_oily_biomass:
-  max_demand: 0.020530763
+  max_demand: 20.53076
 energy_production_wet_biomass:
-  max_demand: 0.264905191
+  max_demand: 264.90519
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad b/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad
index 332b19b14f..4c832a05bc 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 = 126951
-- parent_id = 126951
+- id = 127400
+- parent_id = 127400
 - 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 f424b9cec1..2a00695653 100644
--- a/datasets/GM1701_westerveld/graph_values.yml
+++ b/datasets/GM1701_westerveld/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.165106902
+  max_demand: 165.1069
 energy_production_oily_biomass:
-  max_demand: 0.011755126
+  max_demand: 11.75513
 energy_production_wet_biomass:
-  max_demand: 0.459354184
+  max_demand: 459.35418
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad b/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad
index b007cb8416..6753bd17fc 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 = 126813
-- parent_id = 126813
+- id = 127262
+- parent_id = 127262
 - 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 a1391e7ede..c24319bde2 100644
--- a/datasets/GM1705_lingewaard/graph_values.yml
+++ b/datasets/GM1705_lingewaard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.138203112
+  max_demand: 138.20311
 energy_production_oily_biomass:
-  max_demand: 0.028236483
+  max_demand: 28.23648
 energy_production_wet_biomass:
-  max_demand: 0.148302684
+  max_demand: 148.30268
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad b/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad
index eddc63482b..11a9116413 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 = 126708
-- parent_id = 126708
+- id = 127157
+- parent_id = 127157
 - 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 97e4e11e72..e77dadf2d3 100644
--- a/datasets/GM1706_cranendonck/graph_values.yml
+++ b/datasets/GM1706_cranendonck/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.086123765
+  max_demand: 86.12377
 energy_production_oily_biomass:
-  max_demand: 0.012418584
+  max_demand: 12.41858
 energy_production_wet_biomass:
-  max_demand: 0.160828878
+  max_demand: 160.82888
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad b/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad
index 97588c377d..910c128216 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 = 126906
-- parent_id = 126906
+- id = 127355
+- parent_id = 127355
 - 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 2caf3e4125..eb31b30bdd 100644
--- a/datasets/GM1708_steenwijkerland/graph_values.yml
+++ b/datasets/GM1708_steenwijkerland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.211286042
+  max_demand: 211.28604
 energy_production_oily_biomass:
-  max_demand: 0.026696311
+  max_demand: 26.69631
 energy_production_wet_biomass:
-  max_demand: 1.279919375
+  max_demand: 1279.91938
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad b/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad
index 3559914b5c..ed46746c2f 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 = 126829
-- parent_id = 126829
+- id = 127278
+- parent_id = 127278
 - 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 a632d3c6f8..b35a3bf983 100644
--- a/datasets/GM1709_moerdijk/graph_values.yml
+++ b/datasets/GM1709_moerdijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.187392019
+  max_demand: 187.39202
 energy_production_oily_biomass:
-  max_demand: 0.02245613
+  max_demand: 22.45613
 energy_production_wet_biomass:
-  max_demand: 0.51641385
+  max_demand: 516.41385
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad b/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad
index 25068e4d86..b5b7f7fd0e 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 = 126732
-- parent_id = 126732
+- id = 127181
+- parent_id = 127181
 - 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 bc03ba83c9..436443775b 100644
--- a/datasets/GM1711_echt_susteren/graph_values.yml
+++ b/datasets/GM1711_echt_susteren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.132409361
+  max_demand: 132.40936
 energy_production_oily_biomass:
-  max_demand: 0.019222073
+  max_demand: 19.22207
 energy_production_wet_biomass:
-  max_demand: 0.238136231
+  max_demand: 238.13623
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1714_sluis/GM1714_sluis.derived.ad b/datasets/GM1714_sluis/GM1714_sluis.derived.ad
index 8c58b8d121..744d161342 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 = 126897
-- parent_id = 126897
+- id = 127346
+- parent_id = 127346
 - 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 b188aa312e..767986de61 100644
--- a/datasets/GM1714_sluis/graph_values.yml
+++ b/datasets/GM1714_sluis/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.228281772
+  max_demand: 228.28177
 energy_production_oily_biomass:
-  max_demand: 0.014208465
+  max_demand: 14.20847
 energy_production_wet_biomass:
-  max_demand: 0.680747042
+  max_demand: 680.74704
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad b/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad
index 9e369a8022..9497878b38 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 = 126728
-- parent_id = 126728
+- id = 127177
+- parent_id = 127177
 - 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 5a97995526..dd70173a6a 100644
--- a/datasets/GM1719_drimmelen/graph_values.yml
+++ b/datasets/GM1719_drimmelen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.115479998
+  max_demand: 115.48
 energy_production_oily_biomass:
-  max_demand: 0.016495331
+  max_demand: 16.49533
 energy_production_wet_biomass:
-  max_demand: 0.470123441
+  max_demand: 470.12344
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad b/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad
index 4c5a27a608..ec92212dc4 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 = 126685
-- parent_id = 126685
+- id = 127134
+- parent_id = 127134
 - 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 aa2862ae1d..2ab857096e 100644
--- a/datasets/GM1721_bernheze/graph_values.yml
+++ b/datasets/GM1721_bernheze/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.240955903
+  max_demand: 240.9559
 energy_production_oily_biomass:
-  max_demand: 0.018716581
+  max_demand: 18.71658
 energy_production_wet_biomass:
-  max_demand: 0.324235659
+  max_demand: 324.23566
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad b/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad
index 0ece7f9917..ed87f1be81 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 = 126664
-- parent_id = 126664
+- id = 127113
+- parent_id = 127113
 - 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 85f9a3c274..63ed30e9bf 100644
--- a/datasets/GM1723_alphen_chaam/graph_values.yml
+++ b/datasets/GM1723_alphen_chaam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.10702505
+  max_demand: 107.02505
 energy_production_oily_biomass:
-  max_demand: 0.006166155
+  max_demand: 6.16616
 energy_production_wet_biomass:
-  max_demand: 0.204470469
+  max_demand: 204.47047
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad b/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad
index 3f852e9de0..781d236f30 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 = 126680
-- parent_id = 126680
+- id = 127129
+- parent_id = 127129
 - 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 25ba0885d3..758e613ef3 100644
--- a/datasets/GM1724_bergeijk/graph_values.yml
+++ b/datasets/GM1724_bergeijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.147741336
+  max_demand: 147.74134
 energy_production_oily_biomass:
-  max_demand: 0.011234444
+  max_demand: 11.23444
 energy_production_wet_biomass:
-  max_demand: 0.239272727
+  max_demand: 239.27273
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1728_bladel/GM1728_bladel.derived.ad b/datasets/GM1728_bladel/GM1728_bladel.derived.ad
index 3dbd95a00f..7f13dadd4c 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 = 126689
-- parent_id = 126689
+- id = 127138
+- parent_id = 127138
 - 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 6af306c332..d3b9a5cf45 100644
--- a/datasets/GM1728_bladel/graph_values.yml
+++ b/datasets/GM1728_bladel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.123016639
+  max_demand: 123.01664
 energy_production_oily_biomass:
-  max_demand: 0.01225758
+  max_demand: 12.25758
 energy_production_wet_biomass:
-  max_demand: 0.209851136
+  max_demand: 209.85114
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad b/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad
index 0bb5219da9..e62d46e881 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 = 126758
-- parent_id = 126758
+- id = 127207
+- parent_id = 127207
 - 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 733fcbb89f..6af751c817 100644
--- a/datasets/GM1729_gulpen_wittem/graph_values.yml
+++ b/datasets/GM1729_gulpen_wittem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.072989695
+  max_demand: 72.9897
 energy_production_oily_biomass:
-  max_demand: 0.00865534
+  max_demand: 8.65534
 energy_production_wet_biomass:
-  max_demand: 0.113684807
+  max_demand: 113.68481
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad b/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad
index 895c1f2aee..72dfb74044 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 = 126919
-- parent_id = 126919
+- id = 127368
+- parent_id = 127368
 - 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 469180eb35..090cdad6ed 100644
--- a/datasets/GM1730_tynaarlo/graph_values.yml
+++ b/datasets/GM1730_tynaarlo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.136779111
+  max_demand: 136.77911
 energy_production_oily_biomass:
-  max_demand: 0.020473653
+  max_demand: 20.47365
 energy_production_wet_biomass:
-  max_demand: 0.295613491
+  max_demand: 295.61349
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad b/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad
index ff9143909d..7e1cac6657 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 = 126828
-- parent_id = 126828
+- id = 127277
+- parent_id = 127277
 - 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 4f4db3574e..95c4be33c6 100644
--- a/datasets/GM1731_midden_drenthe/graph_values.yml
+++ b/datasets/GM1731_midden_drenthe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.355931902
+  max_demand: 355.9319
 energy_production_oily_biomass:
-  max_demand: 0.02015772
+  max_demand: 20.15772
 energy_production_wet_biomass:
-  max_demand: 0.652634108
+  max_demand: 652.63411
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad b/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad
index b5b7a6cf86..df7bef5e8d 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 = 126864
-- parent_id = 126864
+- id = 127313
+- parent_id = 127313
 - 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 233073b49b..f819aadb9d 100644
--- a/datasets/GM1734_overbetuwe/graph_values.yml
+++ b/datasets/GM1734_overbetuwe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.193881535
+  max_demand: 193.88154
 energy_production_oily_biomass:
-  max_demand: 0.02888536
+  max_demand: 28.88536
 energy_production_wet_biomass:
-  max_demand: 0.243704066
+  max_demand: 243.70407
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 ac03c0297c..69e7940aa5 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 = 126784
-- parent_id = 126784
+- id = 127233
+- parent_id = 127233
 - 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 9830283851..b6f8327b1c 100644
--- a/datasets/GM1735_hof_van_twente/graph_values.yml
+++ b/datasets/GM1735_hof_van_twente/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.282012559
+  max_demand: 282.01256
 energy_production_oily_biomass:
-  max_demand: 0.021228246
+  max_demand: 21.22825
 energy_production_wet_biomass:
-  max_demand: 0.498841974
+  max_demand: 498.84197
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad b/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad
index 910d5cffab..c1eb4e5391 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 = 126833
-- parent_id = 126833
+- id = 127282
+- parent_id = 127282
 - 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 6c641d2b3e..4df6117510 100644
--- a/datasets/GM1740_neder_betuwe/graph_values.yml
+++ b/datasets/GM1740_neder_betuwe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.165323904
+  max_demand: 165.3239
 energy_production_oily_biomass:
-  max_demand: 0.014602165
+  max_demand: 14.60217
 energy_production_wet_biomass:
-  max_demand: 0.116918232
+  max_demand: 116.91823
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad b/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad
index 72266e0ba1..cb7b33bb9d 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 = 126879
-- parent_id = 126879
+- id = 127328
+- parent_id = 127328
 - 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 24793faef2..ba34c2321e 100644
--- a/datasets/GM1742_rijssen_holten/graph_values.yml
+++ b/datasets/GM1742_rijssen_holten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.149360977
+  max_demand: 149.36098
 energy_production_oily_biomass:
-  max_demand: 0.023269657
+  max_demand: 23.26966
 energy_production_wet_biomass:
-  max_demand: 0.223602878
+  max_demand: 223.60288
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad b/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad
index 1514341732..21690619ad 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 = 126747
-- parent_id = 126747
+- id = 127196
+- parent_id = 127196
 - 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 ebc6aa19c4..544425f7a8 100644
--- a/datasets/GM1771_geldrop_mierlo/graph_values.yml
+++ b/datasets/GM1771_geldrop_mierlo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.113275294
+  max_demand: 113.27529
 energy_production_oily_biomass:
-  max_demand: 0.024056451
+  max_demand: 24.05645
 energy_production_wet_biomass:
-  max_demand: 0.101357442
+  max_demand: 101.35744
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad b/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad
index 6baa391ece..64158e00e2 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 = 126852
-- parent_id = 126852
+- id = 127301
+- parent_id = 127301
 - 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 a4f1c1664e..c7e04580b6 100644
--- a/datasets/GM1773_olst_wijhe/graph_values.yml
+++ b/datasets/GM1773_olst_wijhe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.096057699
+  max_demand: 96.0577
 energy_production_oily_biomass:
-  max_demand: 0.010979268
+  max_demand: 10.97927
 energy_production_wet_biomass:
-  max_demand: 0.275127501
+  max_demand: 275.1275
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad b/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad
index 935538fe57..53b971d676 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 = 126722
-- parent_id = 126722
+- id = 127171
+- parent_id = 127171
 - 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 2c0dcaa04d..d764d2a498 100644
--- a/datasets/GM1774_dinkelland/graph_values.yml
+++ b/datasets/GM1774_dinkelland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.142745644
+  max_demand: 142.74564
 energy_production_oily_biomass:
-  max_demand: 0.016009281
+  max_demand: 16.00928
 energy_production_wet_biomass:
-  max_demand: 0.415177772
+  max_demand: 415.17777
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1783_westland/GM1783_westland.derived.ad b/datasets/GM1783_westland/GM1783_westland.derived.ad
index 61299d708e..61fa491bfd 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 = 126953
-- parent_id = 126953
+- id = 127402
+- parent_id = 127402
 - 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 153bf1f795..09717f278d 100644
--- a/datasets/GM1783_westland/graph_values.yml
+++ b/datasets/GM1783_westland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.278930071
+  max_demand: 278.93007
 energy_production_oily_biomass:
-  max_demand: 0.065983147
+  max_demand: 65.98315
 energy_production_wet_biomass:
-  max_demand: 0.223867763
+  max_demand: 223.86776
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad b/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad
index 1a68ad131e..d752780ba1 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 = 126827
-- parent_id = 126827
+- id = 127276
+- parent_id = 127276
 - 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 77c413ba10..f66a47fdda 100644
--- a/datasets/GM1842_midden_delfland/graph_values.yml
+++ b/datasets/GM1842_midden_delfland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.059993136
+  max_demand: 59.99314
 energy_production_oily_biomass:
-  max_demand: 0.011781251
+  max_demand: 11.78125
 energy_production_wet_biomass:
-  max_demand: 0.132253529
+  max_demand: 132.25353
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad b/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad
index 5b30222b5e..48d029383b 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 = 126684
-- parent_id = 126684
+- id = 127133
+- parent_id = 127133
 - 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 228ffd4408..8d7376df94 100644
--- a/datasets/GM1859_berkelland/graph_values.yml
+++ b/datasets/GM1859_berkelland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.235940505
+  max_demand: 235.94051
 energy_production_oily_biomass:
-  max_demand: 0.026674439
+  max_demand: 26.67444
 energy_production_wet_biomass:
-  max_demand: 0.650176884
+  max_demand: 650.17688
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad b/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad
index 107d026f93..726a20c15a 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 = 126699
-- parent_id = 126699
+- id = 127148
+- parent_id = 127148
 - 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 08dd9d3d4e..210e34d5f3 100644
--- a/datasets/GM1876_bronckhorst/graph_values.yml
+++ b/datasets/GM1876_bronckhorst/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.230553987
+  max_demand: 230.55399
 energy_production_oily_biomass:
-  max_demand: 0.022001065
+  max_demand: 22.00107
 energy_production_wet_biomass:
-  max_demand: 0.613532199
+  max_demand: 613.5322
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad b/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad
index e0b0290b62..7bb3cbd31e 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 = 126895
-- parent_id = 126895
+- id = 127344
+- parent_id = 127344
 - 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 92f2f48546..94ff10da09 100644
--- a/datasets/GM1883_sittard_geleen/graph_values.yml
+++ b/datasets/GM1883_sittard_geleen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.268137904
+  max_demand: 268.1379
 energy_production_oily_biomass:
-  max_demand: 0.05629738
+  max_demand: 56.29738
 energy_production_wet_biomass:
-  max_demand: 0.214720518
+  max_demand: 214.72052
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 cb805f2d65..1b6ce7496a 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 = 126793
-- parent_id = 126793
+- id = 127242
+- parent_id = 127242
 - 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 f46c864e49..5fec7475a3 100644
--- a/datasets/GM1884_kaag_en_braassem/graph_values.yml
+++ b/datasets/GM1884_kaag_en_braassem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.085713416
+  max_demand: 85.71342
 energy_production_oily_biomass:
-  max_demand: 0.016322783
+  max_demand: 16.32278
 energy_production_wet_biomass:
-  max_demand: 0.253185934
+  max_demand: 253.18593
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad b/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad
index c93510e48d..9798f8f1ed 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 = 126711
-- parent_id = 126711
+- id = 127160
+- parent_id = 127160
 - 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 0c2b2d8739..efad340659 100644
--- a/datasets/GM1891_dantumadiel/graph_values.yml
+++ b/datasets/GM1891_dantumadiel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.069162572
+  max_demand: 69.16257
 energy_production_oily_biomass:
-  max_demand: 0.011496912
+  max_demand: 11.49691
 energy_production_wet_biomass:
-  max_demand: 0.215118017
+  max_demand: 215.11802
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad b/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad
index 7d447c4760..90a2a8c2cb 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 = 126972
-- parent_id = 126972
+- id = 127421
+- parent_id = 127421
 - 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 d3d72070ce..5acd1d7d63 100644
--- a/datasets/GM1892_zuidplas/graph_values.yml
+++ b/datasets/GM1892_zuidplas/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.12412914
+  max_demand: 124.12914
 energy_production_oily_biomass:
-  max_demand: 0.025980602
+  max_demand: 25.9806
 energy_production_wet_biomass:
-  max_demand: 0.199402245
+  max_demand: 199.40225
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 584d138d26..5f94763bbb 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 = 126866
-- parent_id = 126866
+- id = 127315
+- parent_id = 127315
 - 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 df59a0731c..ae7b282735 100644
--- a/datasets/GM1894_peel_en_maas/graph_values.yml
+++ b/datasets/GM1894_peel_en_maas/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.278695818
+  max_demand: 278.69582
 energy_production_oily_biomass:
-  max_demand: 0.026314154
+  max_demand: 26.31415
 energy_production_wet_biomass:
-  max_demand: 0.373021129
+  max_demand: 373.02113
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad b/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad
index 327d1b63fd..ddd1fc4659 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 = 126849
-- parent_id = 126849
+- id = 127298
+- parent_id = 127298
 - 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 9e6f5d0e8f..96844fa68d 100644
--- a/datasets/GM1895_oldambt/graph_values.yml
+++ b/datasets/GM1895_oldambt/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.284842762
+  max_demand: 284.84276
 energy_production_oily_biomass:
-  max_demand: 0.023165763
+  max_demand: 23.16576
 energy_production_wet_biomass:
-  max_demand: 0.565057867
+  max_demand: 565.05787
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad b/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad
index 144ce15e2a..5b8778f226 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 = 126975
-- parent_id = 126975
+- id = 127424
+- parent_id = 127424
 - 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 f3c5836c6a..b3b9eacc5c 100644
--- a/datasets/GM1896_zwartewaterland/graph_values.yml
+++ b/datasets/GM1896_zwartewaterland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.079561889
+  max_demand: 79.56189
 energy_production_oily_biomass:
-  max_demand: 0.013671987
+  max_demand: 13.67199
 energy_production_wet_biomass:
-  max_demand: 0.250559944
+  max_demand: 250.55994
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad b/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad
index cb7c1fab1e..f09bf94676 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 = 126909
-- parent_id = 126909
+- id = 127358
+- parent_id = 127358
 - 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 cb5f100bda..74bb06e0ec 100644
--- a/datasets/GM1900_sudwest_fryslan/graph_values.yml
+++ b/datasets/GM1900_sudwest_fryslan/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.447669617
+  max_demand: 447.66962
 energy_production_oily_biomass:
-  max_demand: 0.054504462
+  max_demand: 54.50446
 energy_production_wet_biomass:
-  max_demand: 1.771250971
+  max_demand: 1771.25097
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad b/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad
index 09c60d45bc..89764fa530 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 = 126692
-- parent_id = 126692
+- id = 127141
+- parent_id = 127141
 - 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 a4ba7f38f3..269594e0c7 100644
--- a/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml
+++ b/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.109451535
+  max_demand: 109.45154
 energy_production_oily_biomass:
-  max_demand: 0.020937831
+  max_demand: 20.93783
 energy_production_wet_biomass:
-  max_demand: 0.316181057
+  max_demand: 316.18106
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad b/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad
index ab151c4516..3c2fb7a637 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 = 126737
-- parent_id = 126737
+- id = 127186
+- parent_id = 127186
 - 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 6d03d912c8..e04bf3aa3c 100644
--- a/datasets/GM1903_eijsden_margraten/graph_values.yml
+++ b/datasets/GM1903_eijsden_margraten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.095060104
+  max_demand: 95.0601
 energy_production_oily_biomass:
-  max_demand: 0.015588847
+  max_demand: 15.58885
 energy_production_wet_biomass:
-  max_demand: 0.153981324
+  max_demand: 153.98132
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad b/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad
index 0d207267b4..4cc5bd0a59 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 = 126908
-- parent_id = 126908
+- id = 127357
+- parent_id = 127357
 - 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 a9c3aac62e..fe9ad8cb1e 100644
--- a/datasets/GM1904_stichtse_vecht/graph_values.yml
+++ b/datasets/GM1904_stichtse_vecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.192265409
+  max_demand: 192.26541
 energy_production_oily_biomass:
-  max_demand: 0.039088163
+  max_demand: 39.08816
 energy_production_wet_biomass:
-  max_demand: 0.355340116
+  max_demand: 355.34012
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad b/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad
index 3743ad05fd..860d7b1947 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 = 126785
-- parent_id = 126785
+- id = 127234
+- parent_id = 127234
 - 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 60933c191a..385f860d05 100644
--- a/datasets/GM1911_hollands_kroon/graph_values.yml
+++ b/datasets/GM1911_hollands_kroon/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.285741948
+  max_demand: 285.74195
 energy_production_oily_biomass:
-  max_demand: 0.029050617
+  max_demand: 29.05062
 energy_production_wet_biomass:
-  max_demand: 0.964574202
+  max_demand: 964.5742
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad b/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad
index 0c7f70bf89..a1b7c72650 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 = 126809
-- parent_id = 126809
+- id = 127258
+- parent_id = 127258
 - 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 6f16c03db4..ce33607869 100644
--- a/datasets/GM1916_leidschendam_voorburg/graph_values.yml
+++ b/datasets/GM1916_leidschendam_voorburg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.19601137
+  max_demand: 196.01137
 energy_production_oily_biomass:
-  max_demand: 0.045825427
+  max_demand: 45.82543
 energy_production_wet_biomass:
-  max_demand: 0.176877754
+  max_demand: 176.87775
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad b/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad
index 0f71a81584..7483093596 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 = 126751
-- parent_id = 126751
+- id = 127200
+- parent_id = 127200
 - 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 602cf86225..7e2227ea39 100644
--- a/datasets/GM1924_goeree_overflakkee/graph_values.yml
+++ b/datasets/GM1924_goeree_overflakkee/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.210230754
+  max_demand: 210.23075
 energy_production_oily_biomass:
-  max_demand: 0.0301418
+  max_demand: 30.1418
 energy_production_wet_biomass:
-  max_demand: 0.883777953
+  max_demand: 883.77795
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad b/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad
index 39cd034902..13f353ace1 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 = 126868
-- parent_id = 126868
+- id = 127317
+- parent_id = 127317
 - 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 8c657c95c5..635502aa80 100644
--- a/datasets/GM1926_pijnacker_nootdorp/graph_values.yml
+++ b/datasets/GM1926_pijnacker_nootdorp/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.14187312
+  max_demand: 141.87312
 energy_production_oily_biomass:
-  max_demand: 0.033009497
+  max_demand: 33.0095
 energy_production_wet_biomass:
-  max_demand: 0.124054338
+  max_demand: 124.05434
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad b/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad
index bc8ac70a0f..6396888bb8 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 = 126839
-- parent_id = 126839
+- id = 127288
+- parent_id = 127288
 - 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 86f4581c6a..3e662ecee5 100644
--- a/datasets/GM1930_nissewaard/graph_values.yml
+++ b/datasets/GM1930_nissewaard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.249902774
+  max_demand: 249.90277
 energy_production_oily_biomass:
-  max_demand: 0.051519506
+  max_demand: 51.51951
 energy_production_wet_biomass:
-  max_demand: 0.29612688
+  max_demand: 296.12688
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad b/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad
index 04e558f859..125fdbec8d 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 = 126800
-- parent_id = 126800
+- id = 127249
+- parent_id = 127249
 - 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 58162a4ed7..28fb945c18 100644
--- a/datasets/GM1931_krimpenerwaard/graph_values.yml
+++ b/datasets/GM1931_krimpenerwaard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.182095895
+  max_demand: 182.0959
 energy_production_oily_biomass:
-  max_demand: 0.034052682
+  max_demand: 34.05268
 energy_production_wet_biomass:
-  max_demand: 0.416144936
+  max_demand: 416.14494
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 8bc8759645..974fcad3c2 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 = 126713
-- parent_id = 126713
+- id = 127162
+- parent_id = 127162
 - 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 82e198bca3..e4c9b9300f 100644
--- a/datasets/GM1940_de_fryske_marren/graph_values.yml
+++ b/datasets/GM1940_de_fryske_marren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.259569015
+  max_demand: 259.56902
 energy_production_oily_biomass:
-  max_demand: 0.031246957
+  max_demand: 31.24696
 energy_production_wet_biomass:
-  max_demand: 1.496436485
+  max_demand: 1496.43649
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad b/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad
index e5364f801c..13c9e62e28 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 = 126754
-- parent_id = 126754
+- id = 127203
+- parent_id = 127203
 - 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 5fcb9bb631..17b44c192f 100644
--- a/datasets/GM1942_gooise_meren/graph_values.yml
+++ b/datasets/GM1942_gooise_meren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.158361678
+  max_demand: 158.36168
 energy_production_oily_biomass:
-  max_demand: 0.035065489
+  max_demand: 35.06549
 energy_production_wet_biomass:
-  max_demand: 0.181605819
+  max_demand: 181.60582
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 6765184a7a..b853a081ca 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 = 126679
-- parent_id = 126679
+- id = 127128
+- parent_id = 127128
 - 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 9e0f2fd5a7..08ac04451a 100644
--- a/datasets/GM1945_berg_en_dal/graph_values.yml
+++ b/datasets/GM1945_berg_en_dal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.128199817
+  max_demand: 128.19982
 energy_production_oily_biomass:
-  max_demand: 0.021126783
+  max_demand: 21.12678
 energy_production_wet_biomass:
-  max_demand: 0.216687981
+  max_demand: 216.68798
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad b/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad
index cb323e6dea..945092f3f8 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 = 126978
-- parent_id = 126978
+- id = 127427
+- parent_id = 127427
 - 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 771ce528aa..9aa572ad52 100644
--- a/datasets/GM1948_meierijstad/graph_values.yml
+++ b/datasets/GM1948_meierijstad/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.349995867
+  max_demand: 349.99587
 energy_production_oily_biomass:
-  max_demand: 0.049100191
+  max_demand: 49.10019
 energy_production_wet_biomass:
-  max_demand: 0.605743571
+  max_demand: 605.74357
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad b/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad
index dbffe43a2f..4fd1e26f9b 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 = 126979
-- parent_id = 126979
+- id = 127428
+- parent_id = 127428
 - 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 243dba965d..64bafb5f1e 100644
--- a/datasets/GM1949_waadhoeke/graph_values.yml
+++ b/datasets/GM1949_waadhoeke/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.297721114
+  max_demand: 297.72111
 energy_production_oily_biomass:
-  max_demand: 0.027971586
+  max_demand: 27.97159
 energy_production_wet_biomass:
-  max_demand: 0.729659894
+  max_demand: 729.65989
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad b/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad
index 1dd034c38a..bdc917f6ce 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 = 126980
-- parent_id = 126980
+- id = 127429
+- parent_id = 127429
 - 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 f578a3695f..a6b3d57baf 100644
--- a/datasets/GM1950_westerwolde/graph_values.yml
+++ b/datasets/GM1950_westerwolde/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.212092559
+  max_demand: 212.09256
 energy_production_oily_biomass:
-  max_demand: 0.015309976
+  max_demand: 15.30998
 energy_production_wet_biomass:
-  max_demand: 0.439986612
+  max_demand: 439.98661
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad b/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad
index 6667071abe..db1e24f0a1 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 = 126981
-- parent_id = 126981
+- id = 127430
+- parent_id = 127430
 - 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 564d30a5e3..21d18b2c8c 100644
--- a/datasets/GM1952_midden_groningen/graph_values.yml
+++ b/datasets/GM1952_midden_groningen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.333369601
+  max_demand: 333.3696
 energy_production_oily_biomass:
-  max_demand: 0.036999969
+  max_demand: 36.99997
 energy_production_wet_biomass:
-  max_demand: 0.67549708
+  max_demand: 675.49708
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad b/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad
index 051a45423e..24a39d04c5 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 = 126998
-- parent_id = 126998
+- id = 127435
+- parent_id = 127435
 - 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 13c7367ca1..32af555da1 100644
--- a/datasets/GM1954_beekdaelen/graph_values.yml
+++ b/datasets/GM1954_beekdaelen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.123766429
+  max_demand: 123.76643
 energy_production_oily_biomass:
-  max_demand: 0.021706398
+  max_demand: 21.7064
 energy_production_wet_biomass:
-  max_demand: 0.128334669
+  max_demand: 128.33467
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1955_montferland/GM1955_montferland.derived.ad b/datasets/GM1955_montferland/GM1955_montferland.derived.ad
index 28e1048138..52052e1ba0 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 = 126830
-- parent_id = 126830
+- id = 127279
+- parent_id = 127279
 - 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 b3b14a41d3..c1305cfae5 100644
--- a/datasets/GM1955_montferland/graph_values.yml
+++ b/datasets/GM1955_montferland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.150127947
+  max_demand: 150.12795
 energy_production_oily_biomass:
-  max_demand: 0.021888059
+  max_demand: 21.88806
 energy_production_wet_biomass:
-  max_demand: 0.226741259
+  max_demand: 226.74126
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1959_altena/GM1959_altena.derived.ad b/datasets/GM1959_altena/GM1959_altena.derived.ad
index 11086eed82..1239c3e3d8 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 = 126997
-- parent_id = 126997
+- id = 127434
+- parent_id = 127434
 - 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 aacb5c3ac5..df4519ebf9 100644
--- a/datasets/GM1959_altena/graph_values.yml
+++ b/datasets/GM1959_altena/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.232172565
+  max_demand: 232.17257
 energy_production_oily_biomass:
-  max_demand: 0.033650475
+  max_demand: 33.65048
 energy_production_wet_biomass:
-  max_demand: 0.643295204
+  max_demand: 643.2952
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad b/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad
index 2df4dec6d9..00954d79e5 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 = 126995
-- parent_id = 126995
+- id = 127432
+- parent_id = 127432
 - 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 01735e9c53..79308a66bb 100644
--- a/datasets/GM1960_west_betuwe/graph_values.yml
+++ b/datasets/GM1960_west_betuwe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.199202195
+  max_demand: 199.2022
 energy_production_oily_biomass:
-  max_demand: 0.030801613
+  max_demand: 30.80161
 energy_production_wet_biomass:
-  max_demand: 0.436357906
+  max_demand: 436.35791
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad b/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad
index febf92594a..386100755f 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 = 126983
-- parent_id = 126983
+- id = 127431
+- parent_id = 127431
 - 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 ef05d026a3..04a1fb96ee 100644
--- a/datasets/GM1961_vijfheerenlanden/graph_values.yml
+++ b/datasets/GM1961_vijfheerenlanden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.190557288
+  max_demand: 190.55729
 energy_production_oily_biomass:
-  max_demand: 0.033848541
+  max_demand: 33.84854
 energy_production_wet_biomass:
-  max_demand: 0.348657846
+  max_demand: 348.65785
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad b/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad
index d62499bfa4..2f54637be2 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 = 126999
-- parent_id = 126999
+- id = 127436
+- parent_id = 127436
 - 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 4a449e3df5..7ca1042e5a 100644
--- a/datasets/GM1963_hoeksche_waard/graph_values.yml
+++ b/datasets/GM1963_hoeksche_waard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.335280938
+  max_demand: 335.28094
 energy_production_oily_biomass:
-  max_demand: 0.052648965
+  max_demand: 52.64897
 energy_production_wet_biomass:
-  max_demand: 0.882084864
+  max_demand: 882.08486
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad b/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad
index be916483fe..e2a9625a98 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 = 126996
-- parent_id = 126996
+- id = 127433
+- parent_id = 127433
 - 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 45ba4eb115..51ccf3669e 100644
--- a/datasets/GM1966_het_hogeland/graph_values.yml
+++ b/datasets/GM1966_het_hogeland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.392528427
+  max_demand: 392.52843
 energy_production_oily_biomass:
-  max_demand: 0.030041552
+  max_demand: 30.04155
 energy_production_wet_biomass:
-  max_demand: 5.991852324
+  max_demand: 5991.85232
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad b/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad
index e6bcf4bfd7..adc2138557 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 = 127002
-- parent_id = 127002
+- id = 127439
+- parent_id = 127439
 - 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 8cc3ccba5e..76d16eda85 100644
--- a/datasets/GM1969_westerkwartier/graph_values.yml
+++ b/datasets/GM1969_westerkwartier/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.317604498
+  max_demand: 317.6045
 energy_production_oily_biomass:
-  max_demand: 0.03734871
+  max_demand: 37.34871
 energy_production_wet_biomass:
-  max_demand: 0.708802309
+  max_demand: 708.80231
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad b/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad
index 2fba3d49ac..92c568e938 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 = 127001
-- parent_id = 127001
+- id = 127438
+- parent_id = 127438
 - 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 43766e89c6..527690cf2a 100644
--- a/datasets/GM1970_noardeast_fryslan/graph_values.yml
+++ b/datasets/GM1970_noardeast_fryslan/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.295119981
+  max_demand: 295.11998
 energy_production_oily_biomass:
-  max_demand: 0.027450297
+  max_demand: 27.4503
 energy_production_wet_biomass:
-  max_demand: 1.152551021
+  max_demand: 1152.55102
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad b/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad
index 5470f65393..764acd0d30 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 = 127000
-- parent_id = 127000
+- id = 127437
+- parent_id = 127437
 - 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 012d2565de..7cadc6d84a 100644
--- a/datasets/GM1978_molenlanden/graph_values.yml
+++ b/datasets/GM1978_molenlanden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.168758711
+  max_demand: 168.75871
 energy_production_oily_biomass:
-  max_demand: 0.026646491
+  max_demand: 26.64649
 energy_production_wet_biomass:
-  max_demand: 0.51389615
+  max_demand: 513.89615
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad b/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad
index 47d15d9447..ac367a2494 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 = 127003
-- parent_id = 127003
+- id = 127440
+- parent_id = 127440
 - 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 11afd409a7..8860ffe05c 100644
--- a/datasets/GM1979_eemsdelta/graph_values.yml
+++ b/datasets/GM1979_eemsdelta/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.358628798
+  max_demand: 358.6288
 energy_production_oily_biomass:
-  max_demand: 0.027978876
+  max_demand: 27.97888
 energy_production_wet_biomass:
-  max_demand: 0.63648366
+  max_demand: 636.48366
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 6ed0f850b4..eff7126f3e 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 = 127005
-- parent_id = 127005
+- id = 127441
+- parent_id = 127441
 - 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 528f4570bb..1ea0a18125 100644
--- a/datasets/GM1980_dijk_en_waard/graph_values.yml
+++ b/datasets/GM1980_dijk_en_waard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.074479586
+  max_demand: 74.47959
 energy_production_oily_biomass:
-  max_demand: 0.017006899
+  max_demand: 17.0069
 energy_production_wet_biomass:
-  max_demand: 0.101565377
+  max_demand: 101.56538
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 d41deaca46..60946652f6 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 = 127006
-- parent_id = 127006
+- id = 127442
+- parent_id = 127442
 - 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 21e275e7a4..dbae6b3583 100644
--- a/datasets/GM1982_land_van_cuijk/graph_values.yml
+++ b/datasets/GM1982_land_van_cuijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.107650119
+  max_demand: 107.65012
 energy_production_oily_biomass:
-  max_demand: 0.007051374
+  max_demand: 7.05137
 energy_production_wet_biomass:
-  max_demand: 0.430550136
+  max_demand: 430.55014
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad b/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad
index 30a61df953..264ccadc2e 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 = 127007
-- parent_id = 127007
+- id = 127443
+- parent_id = 127443
 - 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 595fb02bd4..4ee6554edd 100644
--- a/datasets/GM1991_maashorst/graph_values.yml
+++ b/datasets/GM1991_maashorst/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.168001126
+  max_demand: 168.00113
 energy_production_oily_biomass:
-  max_demand: 0.02538519
+  max_demand: 25.38519
 energy_production_wet_biomass:
-  max_demand: 0.21841862
+  max_demand: 218.41862
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 1836d6eccd..2fedce4190 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 = 127008
-- parent_id = 127008
+- id = 127444
+- parent_id = 127444
 - 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 4cee1fc2db..b14d86f7cb 100644
--- a/datasets/GM1992_voorne_aan_zee/graph_values.yml
+++ b/datasets/GM1992_voorne_aan_zee/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.142505264
+  max_demand: 142.50526
 energy_production_oily_biomass:
-  max_demand: 0.019873988
+  max_demand: 19.87399
 energy_production_wet_biomass:
-  max_demand: 0.261651654
+  max_demand: 261.65165
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:

From 89e5505d8d306d6a7590040185b06cda8c2d92fa Mon Sep 17 00:00:00 2001
From: louispt1 <81332401+louispt1@users.noreply.github.com>
Date: Fri, 31 Oct 2025 10:28:23 +0100
Subject: [PATCH 2/7] Power to heat: Input, curves, merit order subtype,
 initial updates (#3335)

* Update merit order subtupe and temperature_cutoff for p2h nodes

* Add p2h curves and temperature_cutoff input

* Queries for chart and minor adjustments to nodes and input for p2h tech

* Add initial update to set uploaded availability curves for temp based p2h

* Update curves and intial updates to match

* Set availability to 1.0 for temperature-dependent p2h

The availability is overwritten by the temperature-dependent behaviour and therefore has no actual effect.

* Add a comment explaining the initial updates input for temperature based p2h

* Expand comment on initial updates file

* Update atlas reference

---------

Co-authored-by: Nora Schinkel <ncschinkel@gmail.com>
Co-authored-by: Mathijs Bijkerk <mathijs.bijkerk@quintel.com>
---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  |  4 +--
 config/user_curves.yml                        | 16 +++++++++
 .../temperature_cutoff_p2h.gql                |  7 ++++
 .../weather_air_temperature_curve.gql         |  2 ++
 ...t_flexibility_p2h_boiler_ht_electricity.ad |  5 +--
 ...t_flexibility_p2h_boiler_mt_electricity.ad |  5 +--
 ...flexibility_p2h_heatpump_ht_electricity.ad |  6 ++--
 ...flexibility_p2h_heatpump_mt_electricity.ad |  6 ++--
 ...rature_cutoff_of_energy_flexibility_p2h.ad | 31 +++++++++++++++++
 ...ates_temperature_based_p2h_availability.ad | 34 +++++++++++++++++++
 11 files changed, 105 insertions(+), 13 deletions(-)
 create mode 100644 gqueries/output_elements/output_series/line_flexibility_temperature_setpoint_p2h_availability_curve/temperature_cutoff_p2h.gql
 create mode 100644 gqueries/output_elements/output_series/line_flexibility_temperature_setpoint_p2h_availability_curve/weather_air_temperature_curve.gql
 create mode 100644 inputs/flexibility/energy/temperature_cutoff_of_energy_flexibility_p2h.ad
 create mode 100644 inputs/misc/initial_updates_temperature_based_p2h_availability.ad

diff --git a/Gemfile b/Gemfile
index 5f70403503..d7b5b2f49f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'rake'
 
 group :development, :test do
   gem 'roo'
-  gem 'atlas',    ref: 'd8b096b', github: 'quintel/atlas'
+  gem 'atlas',         ref: '34f6d2b', github: 'quintel/atlas'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 23df568869..4747f7818c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/quintel/atlas.git
-  revision: d8b096b4ee9d94e81ff3e8e5bbbd753e72e0e32a
-  ref: d8b096b
+  revision: 34f6d2b877b91edf636f449eb1396f6329d63614
+  ref: 34f6d2b
   specs:
     atlas (1.0.0)
       activemodel (>= 7)
diff --git a/config/user_curves.yml b/config/user_curves.yml
index 1349fcda0a..89f0892aaa 100644
--- a/config/user_curves.yml
+++ b/config/user_curves.yml
@@ -781,3 +781,19 @@ weather/insulation_detached_houses_low:
 bunkers_ships_electricity:
   type: profile
   display_group: bunkers
+
+energy_heat_flexibility_p2h_boiler_ht_electricity_availability:
+  type: availability
+  display_group: power_to_heat_availability
+
+energy_heat_flexibility_p2h_boiler_mt_electricity_availability:
+  type: availability
+  display_group: power_to_heat_availability
+
+energy_heat_flexibility_p2h_heatpump_ht_electricity_availability:
+  type: availability
+  display_group: power_to_heat_availability
+
+energy_heat_flexibility_p2h_heatpump_mt_electricity_availability:
+  type: availability
+  display_group: power_to_heat_availability
diff --git a/gqueries/output_elements/output_series/line_flexibility_temperature_setpoint_p2h_availability_curve/temperature_cutoff_p2h.gql b/gqueries/output_elements/output_series/line_flexibility_temperature_setpoint_p2h_availability_curve/temperature_cutoff_p2h.gql
new file mode 100644
index 0000000000..fad9c93e52
--- /dev/null
+++ b/gqueries/output_elements/output_series/line_flexibility_temperature_setpoint_p2h_availability_curve/temperature_cutoff_p2h.gql
@@ -0,0 +1,7 @@
+- query =
+    COALESCE_CURVE(
+      nil,
+      V(energy_heat_flexibility_p2h_heatpump_ht_electricity,"merit_order.temperature_cutoff"),
+      8760
+    )
+- unit = curve
diff --git a/gqueries/output_elements/output_series/line_flexibility_temperature_setpoint_p2h_availability_curve/weather_air_temperature_curve.gql b/gqueries/output_elements/output_series/line_flexibility_temperature_setpoint_p2h_availability_curve/weather_air_temperature_curve.gql
new file mode 100644
index 0000000000..402cf1fdf8
--- /dev/null
+++ b/gqueries/output_elements/output_series/line_flexibility_temperature_setpoint_p2h_availability_curve/weather_air_temperature_curve.gql
@@ -0,0 +1,2 @@
+- query = DATASET_CURVE("weather/air_temperature")
+- unit = curve
diff --git a/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_boiler_ht_electricity.ad b/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_boiler_ht_electricity.ad
index d051ddcb41..42b49f9b8e 100644
--- a/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_boiler_ht_electricity.ad
+++ b/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_boiler_ht_electricity.ad
@@ -3,7 +3,7 @@
 - groups = [heat_production,central_production, mv_net_flexibility, p2h, wacc_proven_tech, costs_storage_and_conversion_p2h, sankey_conversion_group]
 - use = energetic
 - presentation_group = p2h
-- availability = 0.99
+- availability = 1.0
 - full_load_hours = 2190.0
 - typical_input_capacity = 50.25125628140704
 - ccs_investment = 0.0
@@ -20,7 +20,8 @@
 - heat_network_ht.subtype = must_run
 - heat_network_ht.type = producer
 - merit_order.level = mv
-- merit_order.subtype = generic
+- merit_order.subtype = temperature_based_p2h
+- merit_order.temperature_cutoff = 17.0
 - merit_order.type = flex
 - storage.cost_per_mwh = 0.0
 - storage.decay = 0.0
diff --git a/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_boiler_mt_electricity.ad b/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_boiler_mt_electricity.ad
index 70caa04e59..6483260ebb 100644
--- a/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_boiler_mt_electricity.ad
+++ b/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_boiler_mt_electricity.ad
@@ -3,7 +3,7 @@
 - groups = [heat_production,central_production, mv_net_flexibility, p2h, wacc_proven_tech, costs_storage_and_conversion_p2h, sankey_conversion_group]
 - use = energetic
 - presentation_group = p2h
-- availability = 0.99
+- availability = 1.0
 - full_load_hours = 2190.0
 - typical_input_capacity = 50.25125628140704
 - ccs_investment = 0.0
@@ -20,7 +20,8 @@
 - heat_network_mt.subtype = must_run
 - heat_network_mt.type = producer
 - merit_order.level = mv
-- merit_order.subtype = generic
+- merit_order.subtype = temperature_based_p2h
+- merit_order.temperature_cutoff = 17.0
 - merit_order.type = flex
 - storage.cost_per_mwh = 0.0
 - storage.decay = 0.0
diff --git a/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_heatpump_ht_electricity.ad b/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_heatpump_ht_electricity.ad
index 6cd7d16e9e..ecbb51788a 100644
--- a/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_heatpump_ht_electricity.ad
+++ b/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_heatpump_ht_electricity.ad
@@ -4,7 +4,7 @@
 - groups = [heat_production, mv_net_flexibility, p2h, central_production, wacc_proven_tech, costs_storage_and_conversion_p2h, sankey_conversion_group]
 - use = energetic
 - presentation_group = heat_pumps
-- availability = 0.99
+- availability = 1.0
 - full_load_hours = 6500.0
 - ccs_investment = 0.0
 - construction_time = 0.0
@@ -20,7 +20,8 @@
 - heat_network_ht.subtype = must_run
 - heat_network_ht.type = producer
 - merit_order.level = mv
-- merit_order.subtype = generic
+- merit_order.subtype = temperature_based_p2h
+- merit_order.temperature_cutoff = 17.0
 - merit_order.type = flex
 - storage.cost_per_mwh = 0.0
 - storage.decay = 0.0
@@ -28,7 +29,6 @@
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
 - heat_output_capacity = 1.0
-- land_use_per_unit = 0.0
 - takes_part_in_ets = 0.0
 - max_consumption_price = 20.0
 
diff --git a/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_heatpump_mt_electricity.ad b/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_heatpump_mt_electricity.ad
index eee65637d6..ce916e3d19 100644
--- a/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_heatpump_mt_electricity.ad
+++ b/graphs/energy/nodes/energy/energy_heat_flexibility_p2h_heatpump_mt_electricity.ad
@@ -4,7 +4,7 @@
 - groups = [heat_production, mv_net_flexibility, p2h, central_production, wacc_proven_tech, costs_storage_and_conversion_p2h, sankey_conversion_group]
 - use = energetic
 - presentation_group = heat_pumps
-- availability = 0.99
+- availability = 1.0
 - full_load_hours = 6500.0
 - ccs_investment = 0.0
 - construction_time = 0.0
@@ -20,7 +20,8 @@
 - heat_network_mt.subtype = must_run
 - heat_network_mt.type = producer
 - merit_order.level = mv
-- merit_order.subtype = generic
+- merit_order.subtype = temperature_based_p2h
+- merit_order.temperature_cutoff = 17.0
 - merit_order.type = flex
 - storage.cost_per_mwh = 0.0
 - storage.decay = 0.0
@@ -28,7 +29,6 @@
 - electricity_output_capacity = 0.0
 - free_co2_factor = 0.0
 - heat_output_capacity = 1.0
-- land_use_per_unit = 0.0
 - takes_part_in_ets = 0.0
 - max_consumption_price = 20.0
 
diff --git a/inputs/flexibility/energy/temperature_cutoff_of_energy_flexibility_p2h.ad b/inputs/flexibility/energy/temperature_cutoff_of_energy_flexibility_p2h.ad
new file mode 100644
index 0000000000..96f444b61d
--- /dev/null
+++ b/inputs/flexibility/energy/temperature_cutoff_of_energy_flexibility_p2h.ad
@@ -0,0 +1,31 @@
+- query =
+    EACH(
+      UPDATE(
+        V(energy_heat_flexibility_p2h_heatpump_ht_electricity, merit_order),
+        temperature_cutoff,
+        USER_INPUT()
+      ),
+      UPDATE(
+        V(energy_heat_flexibility_p2h_heatpump_mt_electricity, merit_order),
+        temperature_cutoff,
+        USER_INPUT()
+      ),
+      UPDATE(
+        V(energy_heat_flexibility_p2h_boiler_mt_electricity, merit_order),
+        temperature_cutoff,
+        USER_INPUT()
+      ),
+      UPDATE(
+        V(energy_heat_flexibility_p2h_boiler_ht_electricity, merit_order),
+        temperature_cutoff,
+        USER_INPUT()
+      )
+    )
+
+- priority = 0
+- max_value = 30.0
+- min_value = 5.0
+- start_value_gql = present:V(energy_heat_flexibility_p2h_heatpump_ht_electricity, "merit_order.temperature_cutoff")
+- step_value = 0.1
+- unit = #
+- update_period = future
diff --git a/inputs/misc/initial_updates_temperature_based_p2h_availability.ad b/inputs/misc/initial_updates_temperature_based_p2h_availability.ad
new file mode 100644
index 0000000000..2a08ee6e3a
--- /dev/null
+++ b/inputs/misc/initial_updates_temperature_based_p2h_availability.ad
@@ -0,0 +1,34 @@
+# Used to initialize the availability curves for P2H technologies that are temperature-based.
+# For each technology an availability curve is dynamically generated at runtime, calculated
+# based on the scenario's temperature setpoint and air temperature profile.
+
+- query =
+    EACH(
+      UPDATE(
+        V(energy_heat_flexibility_p2h_boiler_ht_electricity),
+        availability_curve,
+        [ATTACHED_CURVE(energy_heat_flexibility_p2h_boiler_ht_electricity_availability_curve)]
+      ),
+      UPDATE(
+        V(energy_heat_flexibility_p2h_boiler_mt_electricity),
+        availability_curve,
+        [ATTACHED_CURVE(energy_heat_flexibility_p2h_boiler_mt_electricity_availability_curve)]
+      ),
+      UPDATE(
+        V(energy_heat_flexibility_p2h_heatpump_ht_electricity),
+        availability_curve,
+        [ATTACHED_CURVE(energy_heat_flexibility_p2h_heatpump_ht_electricity_availability_curve)]
+      ),
+      UPDATE(
+        V(energy_heat_flexibility_p2h_heatpump_mt_electricity),
+        availability_curve,
+        [ATTACHED_CURVE(energy_heat_flexibility_p2h_heatpump_mt_electricity_availability_curve)]
+      )
+    )
+- priority = 0
+- max_value = 0
+- min_value = 0
+- start_value = 0
+- step_value = 0.1
+- unit = #
+- update_period = before

From 2dc8e6b75bc9b8d249e47acae9d142ed66103959 Mon Sep 17 00:00:00 2001
From: kndehaan <102598197+kndehaan@users.noreply.github.com>
Date: Mon, 3 Nov 2025 16:11:03 +0100
Subject: [PATCH 3/7] Apply unique name for biokerosene query (#3342)

---
 ...io_kerosene_demand_international_aviation_transport_fuels.gql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename gqueries/output_elements/output_series/bezier_198_international_transport_fuels/{bio_kerosene_demand_international_aviation.gql => bio_kerosene_demand_international_aviation_transport_fuels.gql} (100%)

diff --git a/gqueries/output_elements/output_series/bezier_198_international_transport_fuels/bio_kerosene_demand_international_aviation.gql b/gqueries/output_elements/output_series/bezier_198_international_transport_fuels/bio_kerosene_demand_international_aviation_transport_fuels.gql
similarity index 100%
rename from gqueries/output_elements/output_series/bezier_198_international_transport_fuels/bio_kerosene_demand_international_aviation.gql
rename to gqueries/output_elements/output_series/bezier_198_international_transport_fuels/bio_kerosene_demand_international_aviation_transport_fuels.gql

From 4d0d8d4fbfae444606c3ecf81fd40586b18df66c Mon Sep 17 00:00:00 2001
From: kndehaan <102598197+kndehaan@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:56:09 +0100
Subject: [PATCH 4/7] Add MT ccus_spec queries for gasification technologies
 (#3343)

---
 ...n_fischer_tropsch_biogenic_waste_ccs_capture_rate.gql | 3 ---
 ..._fischer_tropsch_biogenic_waste_ccs_capture_share.gql | 2 --
 ...tion_fischer_tropsch_dry_biomass_ccs_capture_rate.gql | 3 ---
 ...ion_fischer_tropsch_dry_biomass_ccs_capture_share.gql | 2 --
 ...oduction_fischer_tropsch_dry_biomass_ccs_captured.gql | 1 +
 ...ction_fischer_tropsch_dry_biomass_ccs_primary_co2.gql | 1 +
 ...scher_tropsch_non_biogenic_waste_ccs_capture_rate.gql | 3 ---
 ...cher_tropsch_non_biogenic_waste_ccs_capture_share.gql | 2 --
 ...ethanol_synthesis_biogenic_waste_ccs_capture_rate.gql | 3 ---
 ...thanol_synthesis_biogenic_waste_ccs_capture_share.gql | 2 --
 ...n_methanol_synthesis_dry_biomass_ccs_capture_rate.gql | 3 ---
 ..._methanol_synthesis_dry_biomass_ccs_capture_share.gql | 2 --
 ...nol_synthesis_non_biogenic_waste_ccs_capture_rate.gql | 3 ---
 ...ol_synthesis_non_biogenic_waste_ccs_capture_share.gql | 2 --
 ..._methanol_synthesis_non_biogenic_waste_ccs_co2_in.gql | 5 +++++
 ...methanol_synthesis_non_biogenic_waste_ccs_co2_out.gql | 9 +++++++++
 16 files changed, 16 insertions(+), 30 deletions(-)
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_biogenic_waste_ccs_capture_rate.gql
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_biogenic_waste_ccs_capture_share.gql
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_capture_rate.gql
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_capture_share.gql
 create mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_captured.gql
 create mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_primary_co2.gql
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_non_biogenic_waste_ccs_capture_rate.gql
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_non_biogenic_waste_ccs_capture_share.gql
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_biogenic_waste_ccs_capture_rate.gql
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_biogenic_waste_ccs_capture_share.gql
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_dry_biomass_ccs_capture_rate.gql
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_dry_biomass_ccs_capture_share.gql
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_capture_rate.gql
 delete mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_capture_share.gql
 create mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_co2_in.gql
 create mode 100644 gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_co2_out.gql

diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_biogenic_waste_ccs_capture_rate.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_biogenic_waste_ccs_capture_rate.gql
deleted file mode 100644
index 3d459cd7d2..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_biogenic_waste_ccs_capture_rate.gql
+++ /dev/null
@@ -1,3 +0,0 @@
-- query =
-    V(energy_production_fischer_tropsch_biogenic_waste_ccs,
-      ccs_capture_rate)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_biogenic_waste_ccs_capture_share.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_biogenic_waste_ccs_capture_share.gql
deleted file mode 100644
index a2c6ccab69..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_biogenic_waste_ccs_capture_share.gql
+++ /dev/null
@@ -1,2 +0,0 @@
-- query =
-    V(MEDGE(energy_production_fischer_tropsch_biogenic_waste_ccs_co2,energy_production_fischer_tropsch_biogenic_waste_ccs_captured_co2), parent_share)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_capture_rate.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_capture_rate.gql
deleted file mode 100644
index 115210e1a1..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_capture_rate.gql
+++ /dev/null
@@ -1,3 +0,0 @@
-- query =
-    V(energy_production_fischer_tropsch_dry_biomass_ccs,
-      ccs_capture_rate)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_capture_share.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_capture_share.gql
deleted file mode 100644
index 9488fc083a..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_capture_share.gql
+++ /dev/null
@@ -1,2 +0,0 @@
-- query =
-    V(MEDGE(energy_production_fischer_tropsch_dry_biomass_ccs_co2,energy_production_fischer_tropsch_dry_biomass_ccs_captured_co2), parent_share)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_captured.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_captured.gql
new file mode 100644
index 0000000000..9bedc4fdc1
--- /dev/null
+++ b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_captured.gql
@@ -0,0 +1 @@
+- query = MV(energy_production_fischer_tropsch_dry_biomass_ccs_captured_co2, demand)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_primary_co2.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_primary_co2.gql
new file mode 100644
index 0000000000..5373ba37fc
--- /dev/null
+++ b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_dry_biomass_ccs_primary_co2.gql
@@ -0,0 +1 @@
+- query = NEG(V(energy_production_fischer_tropsch_dry_biomass_ccs, primary_co2_emission))
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_non_biogenic_waste_ccs_capture_rate.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_non_biogenic_waste_ccs_capture_rate.gql
deleted file mode 100644
index c88381ed6f..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_non_biogenic_waste_ccs_capture_rate.gql
+++ /dev/null
@@ -1,3 +0,0 @@
-- query =
-    V(energy_production_fischer_tropsch_non_biogenic_waste_ccs,
-      ccs_capture_rate)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_non_biogenic_waste_ccs_capture_share.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_non_biogenic_waste_ccs_capture_share.gql
deleted file mode 100644
index 71c7617255..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_fischer_tropsch_non_biogenic_waste_ccs_capture_share.gql
+++ /dev/null
@@ -1,2 +0,0 @@
-- query =
-    V(MEDGE(energy_production_fischer_tropsch_non_biogenic_waste_ccs_co2,energy_production_fischer_tropsch_non_biogenic_waste_ccs_captured_co2), parent_share)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_biogenic_waste_ccs_capture_rate.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_biogenic_waste_ccs_capture_rate.gql
deleted file mode 100644
index 6b9e31209c..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_biogenic_waste_ccs_capture_rate.gql
+++ /dev/null
@@ -1,3 +0,0 @@
-- query =
-    V(energy_production_methanol_synthesis_biogenic_waste_ccs,
-      ccs_capture_rate)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_biogenic_waste_ccs_capture_share.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_biogenic_waste_ccs_capture_share.gql
deleted file mode 100644
index b568f04718..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_biogenic_waste_ccs_capture_share.gql
+++ /dev/null
@@ -1,2 +0,0 @@
-- query =
-    V(MEDGE(energy_production_methanol_synthesis_biogenic_waste_ccs_co2,energy_production_methanol_synthesis_biogenic_waste_ccs_captured_co2), parent_share)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_dry_biomass_ccs_capture_rate.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_dry_biomass_ccs_capture_rate.gql
deleted file mode 100644
index 11bad4abe0..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_dry_biomass_ccs_capture_rate.gql
+++ /dev/null
@@ -1,3 +0,0 @@
-- query =
-    V(energy_production_methanol_synthesis_dry_biomass_ccs,
-      ccs_capture_rate)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_dry_biomass_ccs_capture_share.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_dry_biomass_ccs_capture_share.gql
deleted file mode 100644
index 26f0f90411..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_dry_biomass_ccs_capture_share.gql
+++ /dev/null
@@ -1,2 +0,0 @@
-- query =
-    V(MEDGE(energy_production_methanol_synthesis_dry_biomass_ccs_co2,energy_production_methanol_synthesis_dry_biomass_ccs_captured_co2), parent_share)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_capture_rate.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_capture_rate.gql
deleted file mode 100644
index 7859bb16bb..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_capture_rate.gql
+++ /dev/null
@@ -1,3 +0,0 @@
-- query =
-    V(energy_production_methanol_synthesis_non_biogenic_waste_ccs,
-      ccs_capture_rate)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_capture_share.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_capture_share.gql
deleted file mode 100644
index 71b137d91f..0000000000
--- a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_capture_share.gql
+++ /dev/null
@@ -1,2 +0,0 @@
-- query =
-    V(MEDGE(energy_production_methanol_synthesis_non_biogenic_waste_ccs_co2,energy_production_methanol_synthesis_non_biogenic_waste_ccs_captured_co2), parent_share)
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_co2_in.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_co2_in.gql
new file mode 100644
index 0000000000..aaf3489683
--- /dev/null
+++ b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_co2_in.gql
@@ -0,0 +1,5 @@
+- query =
+    PRODUCT(
+      V(energy_production_methanol_synthesis_non_biogenic_waste_ccs, input_of_non_biogenic_waste),
+      V(CARRIER(non_biogenic_waste), co2_conversion_per_mj)
+    )
diff --git a/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_co2_out.gql b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_co2_out.gql
new file mode 100644
index 0000000000..9c4bd32637
--- /dev/null
+++ b/gqueries/mechanical_turk/supply/ccus/turk_energy_production_methanol_synthesis_non_biogenic_waste_ccs_co2_out.gql
@@ -0,0 +1,9 @@
+- query =
+    SUM(
+      PRODUCT(
+        V(energy_production_methanol_synthesis_non_biogenic_waste_ccs, output_of_methanol),
+        V(CARRIER(methanol), co2_conversion_per_mj)
+      ),
+      MV(energy_production_methanol_synthesis_non_biogenic_waste_ccs_captured_co2, demand),
+      MV(energy_production_methanol_synthesis_non_biogenic_waste_ccs_emitted_co2, demand)
+    )

From f285b3466ea0cda4d60db4929f5b656d5a3335d3 Mon Sep 17 00:00:00 2001
From: Max <max.kerpel@quintel.com>
Date: Thu, 6 Nov 2025 10:40:07 +0100
Subject: [PATCH 5/7] 'bug fix decimal point industry steel'

---
 datasets/GM0794_helmond/graph_values.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datasets/GM0794_helmond/graph_values.yml b/datasets/GM0794_helmond/graph_values.yml
index 318b882db6..98157abbf1 100644
--- a/datasets/GM0794_helmond/graph_values.yml
+++ b/datasets/GM0794_helmond/graph_values.yml
@@ -1141,7 +1141,7 @@ industry_final_demand_for_metal_electricity-industry_final_demand_for_metal_stee
 industry_final_demand_for_metal_network_gas-industry_final_demand_for_metal_aluminium_network_gas@network_gas:
   parent_share: 0.3965722034477919
 industry_final_demand_for_metal_network_gas-industry_final_demand_for_metal_steel_network_gas@network_gas:
-  parent_share: 0.603427796552208
+  parent_share: 0.6034277965522081
 industry_final_demand_for_metal_steam_hot_water-industry_final_demand_for_metal_steel_steam_hot_water@steam_hot_water:
   parent_share: 1.0
 industry_final_demand_for_metal_steel_coal-industry_steel_blastfurnace_bof@coal:

From d82fec2b185d36db517e8895594d8d46d5d65ef1 Mon Sep 17 00:00:00 2001
From: Max <max.kerpel@quintel.com>
Date: Tue, 28 Oct 2025 14:47:35 +0100
Subject: [PATCH 6/7] 'bug fix biomass potential'

---
 .../GM0014_groningen.derived.ad               |   4 +-
 datasets/GM0014_groningen/graph_values.yml    |   6 +-
 .../GM0034_almere/GM0034_almere.derived.ad    |   4 +-
 datasets/GM0034_almere/graph_values.yml       |   6 +-
 .../GM0037_stadskanaal.derived.ad             |   4 +-
 datasets/GM0037_stadskanaal/graph_values.yml  |   6 +-
 .../GM0047_veendam/GM0047_veendam.derived.ad  |   4 +-
 datasets/GM0047_veendam/graph_values.yml      |   6 +-
 .../GM0050_zeewolde.derived.ad                |   4 +-
 datasets/GM0050_zeewolde/graph_values.yml     |   6 +-
 .../GM0059_achtkarspelen.derived.ad           |   4 +-
 .../GM0059_achtkarspelen/graph_values.yml     |   6 +-
 .../GM0060_ameland/GM0060_ameland.derived.ad  |   4 +-
 datasets/GM0060_ameland/graph_values.yml      |   6 +-
 .../GM0072_harlingen.derived.ad               |   4 +-
 datasets/GM0072_harlingen/graph_values.yml    |   6 +-
 .../GM0074_heerenveen.derived.ad              |   4 +-
 datasets/GM0074_heerenveen/graph_values.yml   |   6 +-
 .../GM0080_leeuwarden.derived.ad              |   4 +-
 datasets/GM0080_leeuwarden/graph_values.yml   |   6 +-
 .../GM0085_ooststellingwerf.derived.ad        |   4 +-
 .../GM0085_ooststellingwerf/graph_values.yml  |   6 +-
 .../GM0086_opsterland.derived.ad              |   4 +-
 datasets/GM0086_opsterland/graph_values.yml   |   6 +-
 .../GM0088_schiermonnikoog.derived.ad         |   4 +-
 .../GM0088_schiermonnikoog/graph_values.yml   |   6 +-
 .../GM0090_smallingerland.derived.ad          |   4 +-
 .../GM0090_smallingerland/graph_values.yml    |   6 +-
 .../GM0093_terschelling.derived.ad            |   4 +-
 datasets/GM0093_terschelling/graph_values.yml |   6 +-
 .../GM0096_vlieland.derived.ad                |   4 +-
 datasets/GM0096_vlieland/graph_values.yml     |   6 +-
 .../GM0098_weststellingwerf.derived.ad        |   4 +-
 .../GM0098_weststellingwerf/graph_values.yml  |   6 +-
 datasets/GM0106_assen/GM0106_assen.derived.ad |   4 +-
 datasets/GM0106_assen/graph_values.yml        |   6 +-
 .../GM0109_coevorden.derived.ad               |   4 +-
 datasets/GM0109_coevorden/graph_values.yml    |   6 +-
 datasets/GM0114_emmen/GM0114_emmen.derived.ad |   4 +-
 datasets/GM0114_emmen/graph_values.yml        |   6 +-
 .../GM0118_hoogeveen.derived.ad               |   4 +-
 datasets/GM0118_hoogeveen/graph_values.yml    |   6 +-
 .../GM0119_meppel/GM0119_meppel.derived.ad    |   4 +-
 datasets/GM0119_meppel/graph_values.yml       |   6 +-
 .../GM0141_almelo/GM0141_almelo.derived.ad    |   4 +-
 datasets/GM0141_almelo/graph_values.yml       |   6 +-
 datasets/GM0147_borne/GM0147_borne.derived.ad |   4 +-
 datasets/GM0147_borne/graph_values.yml        |   6 +-
 .../GM0148_dalfsen/GM0148_dalfsen.derived.ad  |   4 +-
 datasets/GM0148_dalfsen/graph_values.yml      |   6 +-
 .../GM0150_deventer.derived.ad                |   4 +-
 datasets/GM0150_deventer/graph_values.yml     |   6 +-
 .../GM0153_enschede.derived.ad                |   4 +-
 datasets/GM0153_enschede/graph_values.yml     |   6 +-
 .../GM0158_haaksbergen.derived.ad             |   4 +-
 datasets/GM0158_haaksbergen/graph_values.yml  |   6 +-
 .../GM0160_hardenberg.derived.ad              |   4 +-
 datasets/GM0160_hardenberg/graph_values.yml   |   6 +-
 .../GM0163_hellendoorn.derived.ad             |   4 +-
 datasets/GM0163_hellendoorn/graph_values.yml  |   6 +-
 .../GM0164_hengelo/GM0164_hengelo.derived.ad  |   4 +-
 datasets/GM0164_hengelo/graph_values.yml      |   6 +-
 .../GM0166_kampen/GM0166_kampen.derived.ad    |   4 +-
 datasets/GM0166_kampen/graph_values.yml       |   6 +-
 .../GM0168_losser/GM0168_losser.derived.ad    |   4 +-
 datasets/GM0168_losser/graph_values.yml       |   6 +-
 .../GM0171_noordoostpolder.derived.ad         |   4 +-
 .../GM0171_noordoostpolder/graph_values.yml   |   6 +-
 .../GM0173_oldenzaal.derived.ad               |   4 +-
 datasets/GM0173_oldenzaal/graph_values.yml    |   6 +-
 datasets/GM0175_ommen/GM0175_ommen.derived.ad |   4 +-
 datasets/GM0175_ommen/graph_values.yml        |   6 +-
 .../GM0177_raalte/GM0177_raalte.derived.ad    |   4 +-
 datasets/GM0177_raalte/graph_values.yml       |   6 +-
 .../GM0180_staphorst.derived.ad               |   4 +-
 datasets/GM0180_staphorst/graph_values.yml    |   6 +-
 .../GM0183_tubbergen.derived.ad               |   4 +-
 datasets/GM0183_tubbergen/graph_values.yml    |   6 +-
 datasets/GM0184_urk/GM0184_urk.derived.ad     |   4 +-
 datasets/GM0184_urk/graph_values.yml          |   6 +-
 .../GM0189_wierden/GM0189_wierden.derived.ad  |   4 +-
 datasets/GM0189_wierden/graph_values.yml      |   6 +-
 .../GM0193_zwolle/GM0193_zwolle.derived.ad    |   4 +-
 datasets/GM0193_zwolle/graph_values.yml       |   6 +-
 .../GM0197_aalten/GM0197_aalten.derived.ad    |   4 +-
 datasets/GM0197_aalten/graph_values.yml       |   6 +-
 .../GM0200_apeldoorn.derived.ad               |   4 +-
 datasets/GM0200_apeldoorn/graph_values.yml    |   6 +-
 .../GM0202_arnhem/GM0202_arnhem.derived.ad    |   4 +-
 datasets/GM0202_arnhem/graph_values.yml       |   6 +-
 .../GM0203_barneveld.derived.ad               |   4 +-
 datasets/GM0203_barneveld/graph_values.yml    |   6 +-
 .../GM0209_beuningen.derived.ad               |   4 +-
 datasets/GM0209_beuningen/graph_values.yml    |   6 +-
 .../GM0213_brummen/GM0213_brummen.derived.ad  |   4 +-
 datasets/GM0213_brummen/graph_values.yml      |   6 +-
 datasets/GM0214_buren/GM0214_buren.derived.ad |   4 +-
 datasets/GM0214_buren/graph_values.yml        |   6 +-
 .../GM0216_culemborg.derived.ad               |   4 +-
 datasets/GM0216_culemborg/graph_values.yml    |   6 +-
 .../GM0221_doesburg.derived.ad                |   4 +-
 datasets/GM0221_doesburg/graph_values.yml     |   6 +-
 .../GM0222_doetinchem.derived.ad              |   4 +-
 datasets/GM0222_doetinchem/graph_values.yml   |   6 +-
 .../GM0225_druten/GM0225_druten.derived.ad    |   4 +-
 datasets/GM0225_druten/graph_values.yml       |   6 +-
 .../GM0226_duiven/GM0226_duiven.derived.ad    |   4 +-
 datasets/GM0226_duiven/graph_values.yml       |   6 +-
 datasets/GM0228_ede/GM0228_ede.derived.ad     |   4 +-
 datasets/GM0228_ede/graph_values.yml          |   6 +-
 .../GM0230_elburg/GM0230_elburg.derived.ad    |   4 +-
 datasets/GM0230_elburg/graph_values.yml       |   6 +-
 datasets/GM0232_epe/GM0232_epe.derived.ad     |   4 +-
 datasets/GM0232_epe/graph_values.yml          |   6 +-
 .../GM0233_ermelo/GM0233_ermelo.derived.ad    |   4 +-
 datasets/GM0233_ermelo/graph_values.yml       |   6 +-
 .../GM0243_harderwijk.derived.ad              |   4 +-
 datasets/GM0243_harderwijk/graph_values.yml   |   6 +-
 .../GM0244_hattem/GM0244_hattem.derived.ad    |   4 +-
 datasets/GM0244_hattem/graph_values.yml       |   6 +-
 .../GM0246_heerde/GM0246_heerde.derived.ad    |   4 +-
 datasets/GM0246_heerde/graph_values.yml       |   6 +-
 .../GM0252_heumen/GM0252_heumen.derived.ad    |   4 +-
 datasets/GM0252_heumen/graph_values.yml       |   6 +-
 .../GM0262_lochem/GM0262_lochem.derived.ad    |   4 +-
 datasets/GM0262_lochem/graph_values.yml       |   6 +-
 .../GM0263_maasdriel.derived.ad               |   4 +-
 datasets/GM0263_maasdriel/graph_values.yml    |   6 +-
 .../GM0267_nijkerk/GM0267_nijkerk.derived.ad  |   4 +-
 datasets/GM0267_nijkerk/graph_values.yml      |   6 +-
 .../GM0268_nijmegen.derived.ad                |   4 +-
 datasets/GM0268_nijmegen/graph_values.yml     |   6 +-
 .../GM0269_oldebroek.derived.ad               |   4 +-
 datasets/GM0269_oldebroek/graph_values.yml    |   6 +-
 .../GM0273_putten/GM0273_putten.derived.ad    |   4 +-
 datasets/GM0273_putten/graph_values.yml       |   6 +-
 .../GM0274_renkum/GM0274_renkum.derived.ad    |   4 +-
 datasets/GM0274_renkum/graph_values.yml       |   6 +-
 .../GM0275_rheden/GM0275_rheden.derived.ad    |   4 +-
 datasets/GM0275_rheden/graph_values.yml       |   6 +-
 .../GM0277_rozendaal.derived.ad               |   4 +-
 datasets/GM0277_rozendaal/graph_values.yml    |   6 +-
 .../GM0279_scherpenzeel.derived.ad            |   4 +-
 datasets/GM0279_scherpenzeel/graph_values.yml |   6 +-
 datasets/GM0281_tiel/GM0281_tiel.derived.ad   |   4 +-
 datasets/GM0281_tiel/graph_values.yml         |   6 +-
 .../GM0285_voorst/GM0285_voorst.derived.ad    |   4 +-
 datasets/GM0285_voorst/graph_values.yml       |   6 +-
 .../GM0289_wageningen.derived.ad              |   4 +-
 datasets/GM0289_wageningen/graph_values.yml   |   6 +-
 .../GM0293_westervoort.derived.ad             |   4 +-
 datasets/GM0293_westervoort/graph_values.yml  |   6 +-
 .../GM0294_winterswijk.derived.ad             |   4 +-
 datasets/GM0294_winterswijk/graph_values.yml  |   6 +-
 .../GM0296_wijchen/GM0296_wijchen.derived.ad  |   4 +-
 datasets/GM0296_wijchen/graph_values.yml      |   6 +-
 .../GM0297_zaltbommel.derived.ad              |   4 +-
 datasets/GM0297_zaltbommel/graph_values.yml   |   6 +-
 .../GM0299_zevenaar.derived.ad                |   4 +-
 datasets/GM0299_zevenaar/graph_values.yml     |   6 +-
 .../GM0301_zutphen/GM0301_zutphen.derived.ad  |   4 +-
 datasets/GM0301_zutphen/graph_values.yml      |   6 +-
 .../GM0302_nunspeet.derived.ad                |   4 +-
 datasets/GM0302_nunspeet/graph_values.yml     |   6 +-
 .../GM0303_dronten/GM0303_dronten.derived.ad  |   4 +-
 datasets/GM0303_dronten/graph_values.yml      |   6 +-
 .../GM0307_amersfoort.derived.ad              |   4 +-
 datasets/GM0307_amersfoort/graph_values.yml   |   6 +-
 datasets/GM0308_baarn/GM0308_baarn.derived.ad |   4 +-
 datasets/GM0308_baarn/graph_values.yml        |   6 +-
 .../GM0310_de_bilt/GM0310_de_bilt.derived.ad  |   4 +-
 datasets/GM0310_de_bilt/graph_values.yml      |   6 +-
 .../GM0312_bunnik/GM0312_bunnik.derived.ad    |   4 +-
 datasets/GM0312_bunnik/graph_values.yml       |   6 +-
 .../GM0313_bunschoten.derived.ad              |   4 +-
 datasets/GM0313_bunschoten/graph_values.yml   |   6 +-
 .../GM0317_eemnes/GM0317_eemnes.derived.ad    |   4 +-
 datasets/GM0317_eemnes/graph_values.yml       |   6 +-
 .../GM0321_houten/GM0321_houten.derived.ad    |   4 +-
 datasets/GM0321_houten/graph_values.yml       |   6 +-
 .../GM0327_leusden/GM0327_leusden.derived.ad  |   4 +-
 datasets/GM0327_leusden/graph_values.yml      |   6 +-
 datasets/GM0331_lopik/GM0331_lopik.derived.ad |   4 +-
 datasets/GM0331_lopik/graph_values.yml        |   6 +-
 .../GM0335_montfoort.derived.ad               |   4 +-
 datasets/GM0335_montfoort/graph_values.yml    |   6 +-
 .../GM0339_renswoude.derived.ad               |   4 +-
 datasets/GM0339_renswoude/graph_values.yml    |   6 +-
 .../GM0340_rhenen/GM0340_rhenen.derived.ad    |   4 +-
 datasets/GM0340_rhenen/graph_values.yml       |   6 +-
 datasets/GM0342_soest/GM0342_soest.derived.ad |   4 +-
 datasets/GM0342_soest/graph_values.yml        |   6 +-
 .../GM0344_utrecht/GM0344_utrecht.derived.ad  |   4 +-
 datasets/GM0344_utrecht/graph_values.yml      |   6 +-
 .../GM0345_veenendaal.derived.ad              |   4 +-
 datasets/GM0345_veenendaal/graph_values.yml   |   6 +-
 .../GM0351_woudenberg.derived.ad              |   4 +-
 datasets/GM0351_woudenberg/graph_values.yml   |   6 +-
 .../GM0352_wijk_bij_duurstede.derived.ad      |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0353_ijsselstein.derived.ad             |   4 +-
 datasets/GM0353_ijsselstein/graph_values.yml  |   6 +-
 datasets/GM0355_zeist/GM0355_zeist.derived.ad |   4 +-
 datasets/GM0355_zeist/graph_values.yml        |   6 +-
 .../GM0356_nieuwegein.derived.ad              |   4 +-
 datasets/GM0356_nieuwegein/graph_values.yml   |   6 +-
 .../GM0358_aalsmeer.derived.ad                |   4 +-
 datasets/GM0358_aalsmeer/graph_values.yml     |   6 +-
 .../GM0361_alkmaar/GM0361_alkmaar.derived.ad  |   4 +-
 datasets/GM0361_alkmaar/graph_values.yml      |   6 +-
 .../GM0362_amstelveen.derived.ad              |   4 +-
 datasets/GM0362_amstelveen/graph_values.yml   |   6 +-
 .../GM0363_amsterdam.derived.ad               |   4 +-
 datasets/GM0363_amsterdam/graph_values.yml    |   6 +-
 .../GM0370_beemster.derived.ad                | 211 ++++++++++++++++++
 datasets/GM0370_beemster/graph_values.yml     |   1 +
 .../GM0373_bergen/GM0373_bergen.derived.ad    |   4 +-
 datasets/GM0373_bergen/graph_values.yml       |   6 +-
 .../GM0375_beverwijk.derived.ad               |   4 +-
 datasets/GM0375_beverwijk/graph_values.yml    |   6 +-
 .../GM0376_blaricum.derived.ad                |   4 +-
 datasets/GM0376_blaricum/graph_values.yml     |   6 +-
 .../GM0377_bloemendaal.derived.ad             |   4 +-
 datasets/GM0377_bloemendaal/graph_values.yml  |   6 +-
 .../GM0383_castricum.derived.ad               |   4 +-
 datasets/GM0383_castricum/graph_values.yml    |   6 +-
 .../GM0384_diemen/GM0384_diemen.derived.ad    |   4 +-
 datasets/GM0384_diemen/graph_values.yml       |   6 +-
 .../GM0385_edam_volendam.derived.ad           |   4 +-
 .../GM0385_edam_volendam/graph_values.yml     |   6 +-
 .../GM0388_enkhuizen.derived.ad               |   4 +-
 datasets/GM0388_enkhuizen/graph_values.yml    |   6 +-
 .../GM0392_haarlem/GM0392_haarlem.derived.ad  |   4 +-
 datasets/GM0392_haarlem/graph_values.yml      |   6 +-
 .../GM0394_haarlemmermeer.derived.ad          |   4 +-
 .../GM0394_haarlemmermeer/graph_values.yml    |   6 +-
 .../GM0396_heemskerk.derived.ad               |   4 +-
 datasets/GM0396_heemskerk/graph_values.yml    |   6 +-
 .../GM0397_heemstede.derived.ad               |   4 +-
 datasets/GM0397_heemstede/graph_values.yml    |   6 +-
 .../GM0399_heiloo/GM0399_heiloo.derived.ad    |   4 +-
 datasets/GM0399_heiloo/graph_values.yml       |   6 +-
 .../GM0400_den_helder.derived.ad              |   4 +-
 datasets/GM0400_den_helder/graph_values.yml   |   6 +-
 .../GM0402_hilversum.derived.ad               |   4 +-
 datasets/GM0402_hilversum/graph_values.yml    |   6 +-
 datasets/GM0405_hoorn/GM0405_hoorn.derived.ad |   4 +-
 datasets/GM0405_hoorn/graph_values.yml        |   6 +-
 .../GM0406_huizen/GM0406_huizen.derived.ad    |   4 +-
 datasets/GM0406_huizen/graph_values.yml       |   6 +-
 .../GM0415_landsmeer.derived.ad               |   4 +-
 datasets/GM0415_landsmeer/graph_values.yml    |   6 +-
 datasets/GM0417_laren/GM0417_laren.derived.ad |   4 +-
 datasets/GM0417_laren/graph_values.yml        |   6 +-
 .../GM0420_medemblik.derived.ad               |   4 +-
 datasets/GM0420_medemblik/graph_values.yml    |   6 +-
 .../GM0431_oostzaan.derived.ad                |   4 +-
 datasets/GM0431_oostzaan/graph_values.yml     |   6 +-
 .../GM0432_opmeer/GM0432_opmeer.derived.ad    |   4 +-
 datasets/GM0432_opmeer/graph_values.yml       |   6 +-
 .../GM0437_ouder_amstel.derived.ad            |   4 +-
 datasets/GM0437_ouder_amstel/graph_values.yml |   6 +-
 .../GM0439_purmerend.derived.ad               |   4 +-
 datasets/GM0439_purmerend/graph_values.yml    |   6 +-
 .../GM0441_schagen/GM0441_schagen.derived.ad  |   4 +-
 datasets/GM0441_schagen/graph_values.yml      |   6 +-
 datasets/GM0448_texel/GM0448_texel.derived.ad |   4 +-
 datasets/GM0448_texel/graph_values.yml        |   6 +-
 .../GM0450_uitgeest.derived.ad                |   4 +-
 datasets/GM0450_uitgeest/graph_values.yml     |   6 +-
 .../GM0451_uithoorn.derived.ad                |   4 +-
 datasets/GM0451_uithoorn/graph_values.yml     |   6 +-
 .../GM0453_velsen/GM0453_velsen.derived.ad    |   4 +-
 datasets/GM0453_velsen/graph_values.yml       |   6 +-
 .../GM0473_zandvoort.derived.ad               |   4 +-
 datasets/GM0473_zandvoort/graph_values.yml    |   6 +-
 .../GM0479_zaanstad.derived.ad                |   4 +-
 datasets/GM0479_zaanstad/graph_values.yml     |   6 +-
 .../GM0482_alblasserdam.derived.ad            |   4 +-
 datasets/GM0482_alblasserdam/graph_values.yml |   6 +-
 .../GM0484_alphen_aan_den_rijn.derived.ad     |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0489_barendrecht.derived.ad             |   4 +-
 datasets/GM0489_barendrecht/graph_values.yml  |   6 +-
 .../GM0498_drechterland.derived.ad            |   4 +-
 datasets/GM0498_drechterland/graph_values.yml |   6 +-
 .../GM0502_capelle_aan_den_ijssel.derived.ad  |   4 +-
 .../graph_values.yml                          |   6 +-
 datasets/GM0503_delft/GM0503_delft.derived.ad |   4 +-
 datasets/GM0503_delft/graph_values.yml        |   6 +-
 .../GM0505_dordrecht.derived.ad               |   4 +-
 datasets/GM0505_dordrecht/graph_values.yml    |   6 +-
 .../GM0512_gorinchem.derived.ad               |   4 +-
 datasets/GM0512_gorinchem/graph_values.yml    |   6 +-
 datasets/GM0513_gouda/GM0513_gouda.derived.ad |   4 +-
 datasets/GM0513_gouda/graph_values.yml        |   6 +-
 .../GM0518_s_gravenhage.derived.ad            |   4 +-
 datasets/GM0518_s_gravenhage/graph_values.yml |   6 +-
 .../GM0523_hardinxveld_giessendam.derived.ad  |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0531_hendrik_ido_ambacht.derived.ad     |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0532_stede_broec.derived.ad             |   4 +-
 datasets/GM0532_stede_broec/graph_values.yml  |   6 +-
 .../GM0534_hillegom.derived.ad                |   4 +-
 datasets/GM0534_hillegom/graph_values.yml     |   6 +-
 .../GM0537_katwijk/GM0537_katwijk.derived.ad  |   4 +-
 datasets/GM0537_katwijk/graph_values.yml      |   6 +-
 .../GM0542_krimpen_aan_den_ijssel.derived.ad  |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0546_leiden/GM0546_leiden.derived.ad    |   4 +-
 datasets/GM0546_leiden/graph_values.yml       |   6 +-
 .../GM0547_leiderdorp.derived.ad              |   4 +-
 datasets/GM0547_leiderdorp/graph_values.yml   |   6 +-
 datasets/GM0553_lisse/GM0553_lisse.derived.ad |   4 +-
 datasets/GM0553_lisse/graph_values.yml        |   6 +-
 .../GM0556_maassluis.derived.ad               |   4 +-
 datasets/GM0556_maassluis/graph_values.yml    |   6 +-
 .../GM0569_nieuwkoop.derived.ad               |   4 +-
 datasets/GM0569_nieuwkoop/graph_values.yml    |   6 +-
 .../GM0575_noordwijk.derived.ad               |   4 +-
 datasets/GM0575_noordwijk/graph_values.yml    |   6 +-
 .../GM0579_oegstgeest.derived.ad              |   4 +-
 datasets/GM0579_oegstgeest/graph_values.yml   |   6 +-
 .../GM0589_oudewater.derived.ad               |   4 +-
 datasets/GM0589_oudewater/graph_values.yml    |   6 +-
 .../GM0590_papendrecht.derived.ad             |   4 +-
 datasets/GM0590_papendrecht/graph_values.yml  |   6 +-
 .../GM0597_ridderkerk.derived.ad              |   4 +-
 datasets/GM0597_ridderkerk/graph_values.yml   |   6 +-
 .../GM0599_rotterdam.derived.ad               |   4 +-
 datasets/GM0599_rotterdam/graph_values.yml    |   6 +-
 .../GM0603_rijswijk.derived.ad                |   4 +-
 datasets/GM0603_rijswijk/graph_values.yml     |   6 +-
 .../GM0606_schiedam.derived.ad                |   4 +-
 datasets/GM0606_schiedam/graph_values.yml     |   6 +-
 .../GM0610_sliedrecht.derived.ad              |   4 +-
 datasets/GM0610_sliedrecht/graph_values.yml   |   6 +-
 .../GM0613_albrandswaard.derived.ad           |   4 +-
 .../GM0613_albrandswaard/graph_values.yml     |   6 +-
 .../GM0622_vlaardingen.derived.ad             |   4 +-
 datasets/GM0622_vlaardingen/graph_values.yml  |   6 +-
 .../GM0626_voorschoten.derived.ad             |   4 +-
 datasets/GM0626_voorschoten/graph_values.yml  |   6 +-
 .../GM0627_waddinxveen.derived.ad             |   4 +-
 datasets/GM0627_waddinxveen/graph_values.yml  |   6 +-
 .../GM0629_wassenaar.derived.ad               |   4 +-
 datasets/GM0629_wassenaar/graph_values.yml    |   6 +-
 .../GM0632_woerden/GM0632_woerden.derived.ad  |   4 +-
 datasets/GM0632_woerden/graph_values.yml      |   6 +-
 .../GM0637_zoetermeer.derived.ad              |   4 +-
 datasets/GM0637_zoetermeer/graph_values.yml   |   6 +-
 .../GM0638_zoeterwoude.derived.ad             |   4 +-
 datasets/GM0638_zoeterwoude/graph_values.yml  |   6 +-
 .../GM0642_zwijndrecht.derived.ad             |   4 +-
 datasets/GM0642_zwijndrecht/graph_values.yml  |   6 +-
 .../GM0654_borsele/GM0654_borsele.derived.ad  |   4 +-
 datasets/GM0654_borsele/graph_values.yml      |   6 +-
 datasets/GM0664_goes/GM0664_goes.derived.ad   |   4 +-
 datasets/GM0664_goes/graph_values.yml         |   6 +-
 .../GM0668_west_maas_en_waal.derived.ad       |   4 +-
 .../GM0668_west_maas_en_waal/graph_values.yml |   6 +-
 datasets/GM0677_hulst/GM0677_hulst.derived.ad |   4 +-
 datasets/GM0677_hulst/graph_values.yml        |   6 +-
 .../GM0678_kapelle/GM0678_kapelle.derived.ad  |   4 +-
 datasets/GM0678_kapelle/graph_values.yml      |   6 +-
 .../GM0687_middelburg.derived.ad              |   4 +-
 datasets/GM0687_middelburg/graph_values.yml   |   6 +-
 .../GM0703_reimerswaal.derived.ad             |   4 +-
 datasets/GM0703_reimerswaal/graph_values.yml  |   6 +-
 .../GM0715_terneuzen.derived.ad               |   4 +-
 datasets/GM0715_terneuzen/graph_values.yml    |   6 +-
 .../GM0716_tholen/GM0716_tholen.derived.ad    |   4 +-
 datasets/GM0716_tholen/graph_values.yml       |   6 +-
 datasets/GM0717_veere/GM0717_veere.derived.ad |   4 +-
 datasets/GM0717_veere/graph_values.yml        |   6 +-
 .../GM0718_vlissingen.derived.ad              |   4 +-
 datasets/GM0718_vlissingen/graph_values.yml   |   6 +-
 .../GM0736_de_ronde_venen.derived.ad          |   4 +-
 .../GM0736_de_ronde_venen/graph_values.yml    |   6 +-
 .../GM0737_tytsjerksteradiel.derived.ad       |   4 +-
 .../GM0737_tytsjerksteradiel/graph_values.yml |   6 +-
 datasets/GM0743_asten/GM0743_asten.derived.ad |   4 +-
 datasets/GM0743_asten/graph_values.yml        |   6 +-
 .../GM0744_baarle_nassau.derived.ad           |   4 +-
 .../GM0744_baarle_nassau/graph_values.yml     |   6 +-
 .../GM0748_bergen_op_zoom.derived.ad          |   4 +-
 .../GM0748_bergen_op_zoom/graph_values.yml    |   6 +-
 datasets/GM0753_best/GM0753_best.derived.ad   |   4 +-
 datasets/GM0753_best/graph_values.yml         |   6 +-
 .../GM0755_boekel/GM0755_boekel.derived.ad    |   4 +-
 datasets/GM0755_boekel/graph_values.yml       |   6 +-
 .../GM0757_boxtel/GM0757_boxtel.derived.ad    |   4 +-
 datasets/GM0757_boxtel/graph_values.yml       |   6 +-
 datasets/GM0758_breda/GM0758_breda.derived.ad |   4 +-
 datasets/GM0758_breda/graph_values.yml        |   6 +-
 .../GM0762_deurne/GM0762_deurne.derived.ad    |   4 +-
 datasets/GM0762_deurne/graph_values.yml       |   6 +-
 .../GM0765_pekela/GM0765_pekela.derived.ad    |   4 +-
 datasets/GM0765_pekela/graph_values.yml       |   6 +-
 .../GM0766_dongen/GM0766_dongen.derived.ad    |   4 +-
 datasets/GM0766_dongen/graph_values.yml       |   6 +-
 .../GM0770_eersel/GM0770_eersel.derived.ad    |   4 +-
 datasets/GM0770_eersel/graph_values.yml       |   6 +-
 .../GM0772_eindhoven.derived.ad               |   4 +-
 datasets/GM0772_eindhoven/graph_values.yml    |   6 +-
 .../GM0777_etten_leur.derived.ad              |   4 +-
 datasets/GM0777_etten_leur/graph_values.yml   |   6 +-
 .../GM0779_geertruidenberg.derived.ad         |   4 +-
 .../GM0779_geertruidenberg/graph_values.yml   |   6 +-
 .../GM0784_gilze_en_rijen.derived.ad          |   4 +-
 .../GM0784_gilze_en_rijen/graph_values.yml    |   6 +-
 .../GM0785_goirle/GM0785_goirle.derived.ad    |   4 +-
 datasets/GM0785_goirle/graph_values.yml       |   6 +-
 .../GM0794_helmond/GM0794_helmond.derived.ad  |   4 +-
 datasets/GM0794_helmond/graph_values.yml      |   8 +-
 .../GM0796_s_hertogenbosch.derived.ad         |   4 +-
 .../GM0796_s_hertogenbosch/graph_values.yml   |   6 +-
 .../GM0797_heusden/GM0797_heusden.derived.ad  |   4 +-
 datasets/GM0797_heusden/graph_values.yml      |   6 +-
 .../GM0798_hilvarenbeek.derived.ad            |   4 +-
 datasets/GM0798_hilvarenbeek/graph_values.yml |   6 +-
 .../GM0809_loon_op_zand.derived.ad            |   4 +-
 datasets/GM0809_loon_op_zand/graph_values.yml |   6 +-
 ...20_nuenen_gerwen_en_nederwetten.derived.ad |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0823_oirschot.derived.ad                |   4 +-
 datasets/GM0823_oirschot/graph_values.yml     |   6 +-
 .../GM0824_oisterwijk.derived.ad              |   4 +-
 datasets/GM0824_oisterwijk/graph_values.yml   |   6 +-
 .../GM0826_oosterhout.derived.ad              |   4 +-
 datasets/GM0826_oosterhout/graph_values.yml   |   6 +-
 datasets/GM0828_oss/GM0828_oss.derived.ad     |   4 +-
 datasets/GM0828_oss/graph_values.yml          |   6 +-
 .../GM0840_rucphen/GM0840_rucphen.derived.ad  |   4 +-
 datasets/GM0840_rucphen/graph_values.yml      |   6 +-
 .../GM0845_sint_michielsgestel.derived.ad     |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0847_someren/GM0847_someren.derived.ad  |   4 +-
 datasets/GM0847_someren/graph_values.yml      |   6 +-
 .../GM0848_son_en_breugel.derived.ad          |   4 +-
 .../GM0848_son_en_breugel/graph_values.yml    |   6 +-
 .../GM0851_steenbergen.derived.ad             |   4 +-
 datasets/GM0851_steenbergen/graph_values.yml  |   6 +-
 .../GM0852_waterland.derived.ad               |   4 +-
 datasets/GM0852_waterland/graph_values.yml    |   6 +-
 .../GM0855_tilburg/GM0855_tilburg.derived.ad  |   4 +-
 datasets/GM0855_tilburg/graph_values.yml      |   6 +-
 .../GM0858_valkenswaard.derived.ad            |   4 +-
 datasets/GM0858_valkenswaard/graph_values.yml |   6 +-
 .../GM0861_veldhoven.derived.ad               |   4 +-
 datasets/GM0861_veldhoven/graph_values.yml    |   6 +-
 datasets/GM0865_vught/GM0865_vught.derived.ad |   4 +-
 datasets/GM0865_vught/graph_values.yml        |   6 +-
 .../GM0866_waalre/GM0866_waalre.derived.ad    |   4 +-
 datasets/GM0866_waalre/graph_values.yml       |   6 +-
 .../GM0867_waalwijk.derived.ad                |   4 +-
 datasets/GM0867_waalwijk/graph_values.yml     |   6 +-
 .../GM0873_woensdrecht.derived.ad             |   4 +-
 datasets/GM0873_woensdrecht/graph_values.yml  |   6 +-
 .../GM0879_zundert/GM0879_zundert.derived.ad  |   4 +-
 datasets/GM0879_zundert/graph_values.yml      |   6 +-
 .../GM0880_wormerland.derived.ad              |   4 +-
 datasets/GM0880_wormerland/graph_values.yml   |   6 +-
 .../GM0882_landgraaf.derived.ad               |   4 +-
 datasets/GM0882_landgraaf/graph_values.yml    |   6 +-
 datasets/GM0888_beek/GM0888_beek.derived.ad   |   4 +-
 datasets/GM0888_beek/graph_values.yml         |   6 +-
 .../GM0889_beesel/GM0889_beesel.derived.ad    |   4 +-
 datasets/GM0889_beesel/graph_values.yml       |   6 +-
 .../GM0893_bergen/GM0893_bergen.derived.ad    |   4 +-
 datasets/GM0893_bergen/graph_values.yml       |   6 +-
 .../GM0899_brunssum.derived.ad                |   4 +-
 datasets/GM0899_brunssum/graph_values.yml     |   6 +-
 .../GM0907_gennep/GM0907_gennep.derived.ad    |   4 +-
 datasets/GM0907_gennep/graph_values.yml       |   6 +-
 .../GM0917_heerlen/GM0917_heerlen.derived.ad  |   4 +-
 datasets/GM0917_heerlen/graph_values.yml      |   6 +-
 .../GM0928_kerkrade.derived.ad                |   4 +-
 datasets/GM0928_kerkrade/graph_values.yml     |   6 +-
 .../GM0935_maastricht.derived.ad              |   4 +-
 datasets/GM0935_maastricht/graph_values.yml   |   6 +-
 .../GM0938_meerssen.derived.ad                |   4 +-
 datasets/GM0938_meerssen/graph_values.yml     |   6 +-
 .../GM0944_mook_en_middelaar.derived.ad       |   4 +-
 .../GM0944_mook_en_middelaar/graph_values.yml |   6 +-
 .../GM0946_nederweert.derived.ad              |   4 +-
 datasets/GM0946_nederweert/graph_values.yml   |   6 +-
 .../GM0957_roermond.derived.ad                |   4 +-
 datasets/GM0957_roermond/graph_values.yml     |   6 +-
 .../GM0965_simpelveld.derived.ad              |   4 +-
 datasets/GM0965_simpelveld/graph_values.yml   |   6 +-
 datasets/GM0971_stein/GM0971_stein.derived.ad |   4 +-
 datasets/GM0971_stein/graph_values.yml        |   6 +-
 datasets/GM0981_vaals/GM0981_vaals.derived.ad |   4 +-
 datasets/GM0981_vaals/graph_values.yml        |   6 +-
 datasets/GM0983_venlo/GM0983_venlo.derived.ad |   4 +-
 datasets/GM0983_venlo/graph_values.yml        |   6 +-
 .../GM0984_venray/GM0984_venray.derived.ad    |   4 +-
 datasets/GM0984_venray/graph_values.yml       |   6 +-
 .../GM0986_voerendaal.derived.ad              |   4 +-
 datasets/GM0986_voerendaal/graph_values.yml   |   6 +-
 datasets/GM0988_weert/GM0988_weert.derived.ad |   4 +-
 datasets/GM0988_weert/graph_values.yml        |   6 +-
 .../GM0994_valkenburg_aan_de_geul.derived.ad  |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM0995_lelystad.derived.ad                |   4 +-
 datasets/GM0995_lelystad/graph_values.yml     |   6 +-
 .../GM1507_horst_aan_de_maas.derived.ad       |   4 +-
 .../GM1507_horst_aan_de_maas/graph_values.yml |   6 +-
 .../GM1509_oude_ijsselstreek.derived.ad       |   4 +-
 .../GM1509_oude_ijsselstreek/graph_values.yml |   6 +-
 .../GM1525_teylingen.derived.ad               |   4 +-
 datasets/GM1525_teylingen/graph_values.yml    |   6 +-
 .../GM1581_utrechtse_heuvelrug.derived.ad     |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1586_oost_gelre.derived.ad              |   4 +-
 datasets/GM1586_oost_gelre/graph_values.yml   |   6 +-
 .../GM1598_koggenland.derived.ad              |   4 +-
 datasets/GM1598_koggenland/graph_values.yml   |   6 +-
 .../GM1621_lansingerland.derived.ad           |   4 +-
 .../GM1621_lansingerland/graph_values.yml     |   6 +-
 .../GM1640_leudal/GM1640_leudal.derived.ad    |   4 +-
 datasets/GM1640_leudal/graph_values.yml       |   6 +-
 .../GM1641_maasgouw.derived.ad                |   4 +-
 datasets/GM1641_maasgouw/graph_values.yml     |   6 +-
 .../GM1652_gemert_bakel.derived.ad            |   4 +-
 datasets/GM1652_gemert_bakel/graph_values.yml |   6 +-
 .../GM1655_halderberge.derived.ad             |   4 +-
 datasets/GM1655_halderberge/graph_values.yml  |   6 +-
 .../GM1658_heeze_leende.derived.ad            |   4 +-
 datasets/GM1658_heeze_leende/graph_values.yml |   6 +-
 .../GM1659_laarbeek.derived.ad                |   4 +-
 datasets/GM1659_laarbeek/graph_values.yml     |   6 +-
 .../GM1667_reusel_de_mierden.derived.ad       |   4 +-
 .../GM1667_reusel_de_mierden/graph_values.yml |   6 +-
 .../GM1669_roerdalen.derived.ad               |   4 +-
 datasets/GM1669_roerdalen/graph_values.yml    |   6 +-
 .../GM1674_roosendaal.derived.ad              |   4 +-
 datasets/GM1674_roosendaal/graph_values.yml   |   6 +-
 .../GM1676_schouwen_duiveland.derived.ad      |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1680_aa_en_hunze.derived.ad             |   4 +-
 datasets/GM1680_aa_en_hunze/graph_values.yml  |   6 +-
 .../GM1681_borger_odoorn.derived.ad           |   4 +-
 .../GM1681_borger_odoorn/graph_values.yml     |   6 +-
 .../GM1690_de_wolden.derived.ad               |   4 +-
 datasets/GM1690_de_wolden/graph_values.yml    |   6 +-
 .../GM1695_noord_beveland.derived.ad          |   4 +-
 .../GM1695_noord_beveland/graph_values.yml    |   6 +-
 .../GM1696_wijdemeren.derived.ad              |   4 +-
 datasets/GM1696_wijdemeren/graph_values.yml   |   6 +-
 .../GM1699_noordenveld.derived.ad             |   4 +-
 datasets/GM1699_noordenveld/graph_values.yml  |   6 +-
 .../GM1700_twenterand.derived.ad              |   4 +-
 datasets/GM1700_twenterand/graph_values.yml   |   6 +-
 .../GM1701_westerveld.derived.ad              |   4 +-
 datasets/GM1701_westerveld/graph_values.yml   |   6 +-
 .../GM1705_lingewaard.derived.ad              |   4 +-
 datasets/GM1705_lingewaard/graph_values.yml   |   6 +-
 .../GM1706_cranendonck.derived.ad             |   4 +-
 datasets/GM1706_cranendonck/graph_values.yml  |   6 +-
 .../GM1708_steenwijkerland.derived.ad         |   4 +-
 .../GM1708_steenwijkerland/graph_values.yml   |   6 +-
 .../GM1709_moerdijk.derived.ad                |   4 +-
 datasets/GM1709_moerdijk/graph_values.yml     |   6 +-
 .../GM1711_echt_susteren.derived.ad           |   4 +-
 .../GM1711_echt_susteren/graph_values.yml     |   6 +-
 datasets/GM1714_sluis/GM1714_sluis.derived.ad |   4 +-
 datasets/GM1714_sluis/graph_values.yml        |   6 +-
 .../GM1719_drimmelen.derived.ad               |   4 +-
 datasets/GM1719_drimmelen/graph_values.yml    |   6 +-
 .../GM1721_bernheze.derived.ad                |   4 +-
 datasets/GM1721_bernheze/graph_values.yml     |   6 +-
 .../GM1723_alphen_chaam.derived.ad            |   4 +-
 datasets/GM1723_alphen_chaam/graph_values.yml |   6 +-
 .../GM1724_bergeijk.derived.ad                |   4 +-
 datasets/GM1724_bergeijk/graph_values.yml     |   6 +-
 .../GM1728_bladel/GM1728_bladel.derived.ad    |   4 +-
 datasets/GM1728_bladel/graph_values.yml       |   6 +-
 .../GM1729_gulpen_wittem.derived.ad           |   4 +-
 .../GM1729_gulpen_wittem/graph_values.yml     |   6 +-
 .../GM1730_tynaarlo.derived.ad                |   4 +-
 datasets/GM1730_tynaarlo/graph_values.yml     |   6 +-
 .../GM1731_midden_drenthe.derived.ad          |   4 +-
 .../GM1731_midden_drenthe/graph_values.yml    |   6 +-
 .../GM1734_overbetuwe.derived.ad              |   4 +-
 datasets/GM1734_overbetuwe/graph_values.yml   |   6 +-
 .../GM1735_hof_van_twente.derived.ad          |   4 +-
 .../GM1735_hof_van_twente/graph_values.yml    |   6 +-
 .../GM1740_neder_betuwe.derived.ad            |   4 +-
 datasets/GM1740_neder_betuwe/graph_values.yml |   6 +-
 .../GM1742_rijssen_holten.derived.ad          |   4 +-
 .../GM1742_rijssen_holten/graph_values.yml    |   6 +-
 .../GM1771_geldrop_mierlo.derived.ad          |   4 +-
 .../GM1771_geldrop_mierlo/graph_values.yml    |   6 +-
 .../GM1773_olst_wijhe.derived.ad              |   4 +-
 datasets/GM1773_olst_wijhe/graph_values.yml   |   6 +-
 .../GM1774_dinkelland.derived.ad              |   4 +-
 datasets/GM1774_dinkelland/graph_values.yml   |   6 +-
 .../GM1783_westland.derived.ad                |   4 +-
 datasets/GM1783_westland/graph_values.yml     |   6 +-
 .../GM1842_midden_delfland.derived.ad         |   4 +-
 .../GM1842_midden_delfland/graph_values.yml   |   6 +-
 .../GM1859_berkelland.derived.ad              |   4 +-
 datasets/GM1859_berkelland/graph_values.yml   |   6 +-
 .../GM1876_bronckhorst.derived.ad             |   4 +-
 datasets/GM1876_bronckhorst/graph_values.yml  |   6 +-
 .../GM1883_sittard_geleen.derived.ad          |   4 +-
 .../GM1883_sittard_geleen/graph_values.yml    |   6 +-
 .../GM1884_kaag_en_braassem.derived.ad        |   4 +-
 .../GM1884_kaag_en_braassem/graph_values.yml  |   6 +-
 .../GM1891_dantumadiel.derived.ad             |   4 +-
 datasets/GM1891_dantumadiel/graph_values.yml  |   6 +-
 .../GM1892_zuidplas.derived.ad                |   4 +-
 datasets/GM1892_zuidplas/graph_values.yml     |   6 +-
 .../GM1894_peel_en_maas.derived.ad            |   4 +-
 datasets/GM1894_peel_en_maas/graph_values.yml |   6 +-
 .../GM1895_oldambt/GM1895_oldambt.derived.ad  |   4 +-
 datasets/GM1895_oldambt/graph_values.yml      |   6 +-
 .../GM1896_zwartewaterland.derived.ad         |   4 +-
 .../GM1896_zwartewaterland/graph_values.yml   |   6 +-
 .../GM1900_sudwest_fryslan.derived.ad         |   4 +-
 .../GM1900_sudwest_fryslan/graph_values.yml   |   6 +-
 .../GM1901_bodegraven_reeuwijk.derived.ad     |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1903_eijsden_margraten.derived.ad       |   4 +-
 .../GM1903_eijsden_margraten/graph_values.yml |   6 +-
 .../GM1904_stichtse_vecht.derived.ad          |   4 +-
 .../GM1904_stichtse_vecht/graph_values.yml    |   6 +-
 .../GM1911_hollands_kroon.derived.ad          |   4 +-
 .../GM1911_hollands_kroon/graph_values.yml    |   6 +-
 .../GM1916_leidschendam_voorburg.derived.ad   |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1924_goeree_overflakkee.derived.ad      |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1926_pijnacker_nootdorp.derived.ad      |   4 +-
 .../graph_values.yml                          |   6 +-
 .../GM1930_nissewaard.derived.ad              |   4 +-
 datasets/GM1930_nissewaard/graph_values.yml   |   6 +-
 .../GM1931_krimpenerwaard.derived.ad          |   4 +-
 .../GM1931_krimpenerwaard/graph_values.yml    |   6 +-
 .../GM1940_de_fryske_marren.derived.ad        |   4 +-
 .../GM1940_de_fryske_marren/graph_values.yml  |   6 +-
 .../GM1942_gooise_meren.derived.ad            |   4 +-
 datasets/GM1942_gooise_meren/graph_values.yml |   6 +-
 .../GM1945_berg_en_dal.derived.ad             |   4 +-
 datasets/GM1945_berg_en_dal/graph_values.yml  |   6 +-
 .../GM1948_meierijstad.derived.ad             |   4 +-
 datasets/GM1948_meierijstad/graph_values.yml  |   6 +-
 .../GM1949_waadhoeke.derived.ad               |   4 +-
 datasets/GM1949_waadhoeke/graph_values.yml    |   6 +-
 .../GM1950_westerwolde.derived.ad             |   4 +-
 datasets/GM1950_westerwolde/graph_values.yml  |   6 +-
 .../GM1952_midden_groningen.derived.ad        |   4 +-
 .../GM1952_midden_groningen/graph_values.yml  |   6 +-
 .../GM1954_beekdaelen.derived.ad              |   4 +-
 datasets/GM1954_beekdaelen/graph_values.yml   |   6 +-
 .../GM1955_montferland.derived.ad             |   4 +-
 datasets/GM1955_montferland/graph_values.yml  |   6 +-
 .../GM1959_altena/GM1959_altena.derived.ad    |   4 +-
 datasets/GM1959_altena/graph_values.yml       |   6 +-
 .../GM1960_west_betuwe.derived.ad             |   4 +-
 datasets/GM1960_west_betuwe/graph_values.yml  |   6 +-
 .../GM1961_vijfheerenlanden.derived.ad        |   4 +-
 .../GM1961_vijfheerenlanden/graph_values.yml  |   6 +-
 .../GM1963_hoeksche_waard.derived.ad          |   4 +-
 .../GM1963_hoeksche_waard/graph_values.yml    |   6 +-
 .../GM1966_het_hogeland.derived.ad            |   4 +-
 datasets/GM1966_het_hogeland/graph_values.yml |   6 +-
 .../GM1969_westerkwartier.derived.ad          |   4 +-
 .../GM1969_westerkwartier/graph_values.yml    |   6 +-
 .../GM1970_noardeast_fryslan.derived.ad       |   4 +-
 .../GM1970_noardeast_fryslan/graph_values.yml |   6 +-
 .../GM1978_molenlanden.derived.ad             |   4 +-
 datasets/GM1978_molenlanden/graph_values.yml  |   6 +-
 .../GM1979_eemsdelta.derived.ad               |   4 +-
 datasets/GM1979_eemsdelta/graph_values.yml    |   6 +-
 .../GM1980_dijk_en_waard.derived.ad           |   4 +-
 .../GM1980_dijk_en_waard/graph_values.yml     |   6 +-
 .../GM1982_land_van_cuijk.derived.ad          |   4 +-
 .../GM1982_land_van_cuijk/graph_values.yml    |   6 +-
 .../GM1991_maashorst.derived.ad               |   4 +-
 datasets/GM1991_maashorst/graph_values.yml    |   6 +-
 .../GM1992_voorne_aan_zee.derived.ad          |   4 +-
 .../GM1992_voorne_aan_zee/graph_values.yml    |   6 +-
 686 files changed, 1923 insertions(+), 1711 deletions(-)
 create mode 100644 datasets/GM0370_beemster/GM0370_beemster.derived.ad
 create mode 100644 datasets/GM0370_beemster/graph_values.yml

diff --git a/datasets/GM0014_groningen/GM0014_groningen.derived.ad b/datasets/GM0014_groningen/GM0014_groningen.derived.ad
index 62e94cfd68..fb1dc441f2 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 = 126757
-- parent_id = 126757
+- id = 127206
+- parent_id = 127206
 - 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 4b4e105e08..046f00c877 100644
--- a/datasets/GM0014_groningen/graph_values.yml
+++ b/datasets/GM0014_groningen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.537288804
+  max_demand: 537.2888
 energy_production_oily_biomass:
-  max_demand: 0.12383285
+  max_demand: 123.83285
 energy_production_wet_biomass:
-  max_demand: 0.399862428
+  max_demand: 399.86243
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0034_almere/GM0034_almere.derived.ad b/datasets/GM0034_almere/GM0034_almere.derived.ad
index 318a342712..195991301a 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 = 126662
-- parent_id = 126662
+- id = 127111
+- parent_id = 127111
 - 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 7a4dd0ab07..9a6a49ca30 100644
--- a/datasets/GM0034_almere/graph_values.yml
+++ b/datasets/GM0034_almere/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.610690855
+  max_demand: 610.69086
 energy_production_oily_biomass:
-  max_demand: 0.126314744
+  max_demand: 126.31474
 energy_production_wet_biomass:
-  max_demand: 0.588570111
+  max_demand: 588.57011
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad b/datasets/GM0037_stadskanaal/GM0037_stadskanaal.derived.ad
index ba4bff9bd2..df95471a18 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 = 126902
-- parent_id = 126902
+- id = 127351
+- parent_id = 127351
 - 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 671efc9cab..4ed70f0b9f 100644
--- a/datasets/GM0037_stadskanaal/graph_values.yml
+++ b/datasets/GM0037_stadskanaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.15903103
+  max_demand: 159.03103
 energy_production_oily_biomass:
-  max_demand: 0.019313815
+  max_demand: 19.31382
 energy_production_wet_biomass:
-  max_demand: 0.206689826
+  max_demand: 206.68983
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0047_veendam/GM0047_veendam.derived.ad b/datasets/GM0047_veendam/GM0047_veendam.derived.ad
index cd2e056b40..ce219d9865 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 = 126929
-- parent_id = 126929
+- id = 127378
+- parent_id = 127378
 - 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 4c4e6a897c..aca7549306 100644
--- a/datasets/GM0047_veendam/graph_values.yml
+++ b/datasets/GM0047_veendam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.108689181
+  max_demand: 108.68918
 energy_production_oily_biomass:
-  max_demand: 0.01670251
+  max_demand: 16.70251
 energy_production_wet_biomass:
-  max_demand: 0.137042526
+  max_demand: 137.04253
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad b/datasets/GM0050_zeewolde/GM0050_zeewolde.derived.ad
index 56dcbcfaa7..180cf0ebb8 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 = 126967
-- parent_id = 126967
+- id = 127416
+- parent_id = 127416
 - 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 40a2cec803..01563bcdaf 100644
--- a/datasets/GM0050_zeewolde/graph_values.yml
+++ b/datasets/GM0050_zeewolde/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.219134218
+  max_demand: 219.13422
 energy_production_oily_biomass:
-  max_demand: 0.013554119
+  max_demand: 13.55412
 energy_production_wet_biomass:
-  max_demand: 0.959882971
+  max_demand: 959.88297
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad b/datasets/GM0059_achtkarspelen/GM0059_achtkarspelen.derived.ad
index a6965f3623..748bbd7b07 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 = 126657
-- parent_id = 126657
+- id = 127106
+- parent_id = 127106
 - 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 1fac638677..7a0d55639a 100644
--- a/datasets/GM0059_achtkarspelen/graph_values.yml
+++ b/datasets/GM0059_achtkarspelen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.150534262
+  max_demand: 150.53426
 energy_production_oily_biomass:
-  max_demand: 0.01692184
+  max_demand: 16.92184
 energy_production_wet_biomass:
-  max_demand: 0.206593892
+  max_demand: 206.59389
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0060_ameland/GM0060_ameland.derived.ad b/datasets/GM0060_ameland/GM0060_ameland.derived.ad
index 96859a5cc4..55d65838b9 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 = 126665
-- parent_id = 126665
+- id = 127114
+- parent_id = 127114
 - 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 918414cfc0..84122c5e6d 100644
--- a/datasets/GM0060_ameland/graph_values.yml
+++ b/datasets/GM0060_ameland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.017046558
+  max_demand: 17.04656
 energy_production_oily_biomass:
-  max_demand: 0.002231578
+  max_demand: 2.23158
 energy_production_wet_biomass:
-  max_demand: 0.095491631
+  max_demand: 95.49163
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad b/datasets/GM0072_harlingen/GM0072_harlingen.derived.ad
index 82dbb89bbd..e6e09bc43e 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 = 126766
-- parent_id = 126766
+- id = 127215
+- parent_id = 127215
 - 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 4989a89d54..431e454bc3 100644
--- a/datasets/GM0072_harlingen/graph_values.yml
+++ b/datasets/GM0072_harlingen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.047885
+  max_demand: 47.885
 energy_production_oily_biomass:
-  max_demand: 0.009573975
+  max_demand: 9.57398
 energy_production_wet_biomass:
-  max_demand: 0.075143256
+  max_demand: 75.14326
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad b/datasets/GM0074_heerenveen/GM0074_heerenveen.derived.ad
index 2dd0b7f865..58e07e9a3a 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 = 126771
-- parent_id = 126771
+- id = 127220
+- parent_id = 127220
 - 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 b02a1a275f..5ff168df7d 100644
--- a/datasets/GM0074_heerenveen/graph_values.yml
+++ b/datasets/GM0074_heerenveen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.23204634
+  max_demand: 232.04634
 energy_production_oily_biomass:
-  max_demand: 0.030534286
+  max_demand: 30.53429
 energy_production_wet_biomass:
-  max_demand: 0.502009306
+  max_demand: 502.00931
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad b/datasets/GM0080_leeuwarden/GM0080_leeuwarden.derived.ad
index 53f109f32c..8b9a809f4e 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 = 126806
-- parent_id = 126806
+- id = 127255
+- parent_id = 127255
 - 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 e9d52e4cb0..9277fb7c2e 100644
--- a/datasets/GM0080_leeuwarden/graph_values.yml
+++ b/datasets/GM0080_leeuwarden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.383663739
+  max_demand: 383.66374
 energy_production_oily_biomass:
-  max_demand: 0.074795238
+  max_demand: 74.79524
 energy_production_wet_biomass:
-  max_demand: 0.780985638
+  max_demand: 780.98564
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad b/datasets/GM0085_ooststellingwerf/GM0085_ooststellingwerf.derived.ad
index 4ecfe37fb7..3713329ac4 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 = 126856
-- parent_id = 126856
+- id = 127305
+- parent_id = 127305
 - 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 b6c2a9e6ec..13b22c8630 100644
--- a/datasets/GM0085_ooststellingwerf/graph_values.yml
+++ b/datasets/GM0085_ooststellingwerf/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.188756067
+  max_demand: 188.75607
 energy_production_oily_biomass:
-  max_demand: 0.01549103
+  max_demand: 15.49103
 energy_production_wet_biomass:
-  max_demand: 0.524225871
+  max_demand: 524.22587
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad b/datasets/GM0086_opsterland/GM0086_opsterland.derived.ad
index a8444a4652..655481f0e5 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 = 126859
-- parent_id = 126859
+- id = 127308
+- parent_id = 127308
 - 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 27d3564e4c..f08c407663 100644
--- a/datasets/GM0086_opsterland/graph_values.yml
+++ b/datasets/GM0086_opsterland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.161587388
+  max_demand: 161.58739
 energy_production_oily_biomass:
-  max_demand: 0.01805859
+  max_demand: 18.05859
 energy_production_wet_biomass:
-  max_demand: 0.446875832
+  max_demand: 446.87583
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad b/datasets/GM0088_schiermonnikoog/GM0088_schiermonnikoog.derived.ad
index ca7120ae61..3b7c177b3e 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 = 126890
-- parent_id = 126890
+- id = 127339
+- parent_id = 127339
 - 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 06ddd2d519..392055a21a 100644
--- a/datasets/GM0088_schiermonnikoog/graph_values.yml
+++ b/datasets/GM0088_schiermonnikoog/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.005906615
+  max_demand: 5.90662
 energy_production_oily_biomass:
-  max_demand: 0.000568679
+  max_demand: 0.56868
 energy_production_wet_biomass:
-  max_demand: 0.117069075
+  max_demand: 117.06908
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad b/datasets/GM0090_smallingerland/GM0090_smallingerland.derived.ad
index d0220e80a0..077cc5b533 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 = 126898
-- parent_id = 126898
+- id = 127347
+- parent_id = 127347
 - 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 5f5d5d187c..3bbdf88fca 100644
--- a/datasets/GM0090_smallingerland/graph_values.yml
+++ b/datasets/GM0090_smallingerland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.192053738
+  max_demand: 192.05374
 energy_production_oily_biomass:
-  max_demand: 0.03398585
+  max_demand: 33.98585
 energy_production_wet_biomass:
-  max_demand: 0.367940871
+  max_demand: 367.94087
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad b/datasets/GM0093_terschelling/GM0093_terschelling.derived.ad
index a1b1739f00..4d37f9b7e4 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 = 126911
-- parent_id = 126911
+- id = 127360
+- parent_id = 127360
 - 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 e75b198c14..6c47368f5a 100644
--- a/datasets/GM0093_terschelling/graph_values.yml
+++ b/datasets/GM0093_terschelling/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.023914376
+  max_demand: 23.91438
 energy_production_oily_biomass:
-  max_demand: 0.002970982
+  max_demand: 2.97098
 energy_production_wet_biomass:
-  max_demand: 0.19397981
+  max_demand: 193.97981
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad b/datasets/GM0096_vlieland/GM0096_vlieland.derived.ad
index ec97f48e3a..c537d671b8 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 = 126937
-- parent_id = 126937
+- id = 127386
+- parent_id = 127386
 - 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 a84deede61..e66629978f 100644
--- a/datasets/GM0096_vlieland/graph_values.yml
+++ b/datasets/GM0096_vlieland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.006847427
+  max_demand: 6.84743
 energy_production_oily_biomass:
-  max_demand: 0.000691407
+  max_demand: 0.69141
 energy_production_wet_biomass:
-  max_demand: 0.023221151
+  max_demand: 23.22115
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad b/datasets/GM0098_weststellingwerf/GM0098_weststellingwerf.derived.ad
index 14af394eae..9c06f48deb 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 = 126954
-- parent_id = 126954
+- id = 127403
+- parent_id = 127403
 - 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 1911a55d26..609afc9763 100644
--- a/datasets/GM0098_weststellingwerf/graph_values.yml
+++ b/datasets/GM0098_weststellingwerf/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.16617119
+  max_demand: 166.17119
 energy_production_oily_biomass:
-  max_demand: 0.015699424
+  max_demand: 15.69942
 energy_production_wet_biomass:
-  max_demand: 0.644779897
+  max_demand: 644.7799
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0106_assen/GM0106_assen.derived.ad b/datasets/GM0106_assen/GM0106_assen.derived.ad
index f082b72a90..68eb16df25 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 = 126671
-- parent_id = 126671
+- id = 127120
+- parent_id = 127120
 - 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 f38065d5a5..e40c71530c 100644
--- a/datasets/GM0106_assen/graph_values.yml
+++ b/datasets/GM0106_assen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.203385757
+  max_demand: 203.38576
 energy_production_oily_biomass:
-  max_demand: 0.041291793
+  max_demand: 41.29179
 energy_production_wet_biomass:
-  max_demand: 0.176288465
+  max_demand: 176.28847
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad b/datasets/GM0109_coevorden/GM0109_coevorden.derived.ad
index 057195adac..ff2b97be0e 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 = 126707
-- parent_id = 126707
+- id = 127156
+- parent_id = 127156
 - 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 7755afeca3..6d8de67ce8 100644
--- a/datasets/GM0109_coevorden/graph_values.yml
+++ b/datasets/GM0109_coevorden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.212846906
+  max_demand: 212.84691
 energy_production_oily_biomass:
-  max_demand: 0.021558152
+  max_demand: 21.55815
 energy_production_wet_biomass:
-  max_demand: 0.554110241
+  max_demand: 554.11024
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0114_emmen/GM0114_emmen.derived.ad b/datasets/GM0114_emmen/GM0114_emmen.derived.ad
index c55d261607..c143d55c9e 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 = 126740
-- parent_id = 126740
+- id = 127189
+- parent_id = 127189
 - 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 5d61ae6f78..4c4cb555e8 100644
--- a/datasets/GM0114_emmen/graph_values.yml
+++ b/datasets/GM0114_emmen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.443555329
+  max_demand: 443.55533
 energy_production_oily_biomass:
-  max_demand: 0.065077878
+  max_demand: 65.07788
 energy_production_wet_biomass:
-  max_demand: 0.706690169
+  max_demand: 706.69017
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad b/datasets/GM0118_hoogeveen/GM0118_hoogeveen.derived.ad
index e1a7ca5d96..f7c179e828 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 = 126786
-- parent_id = 126786
+- id = 127235
+- parent_id = 127235
 - 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 90bb6b41d1..42c2d9c05e 100644
--- a/datasets/GM0118_hoogeveen/graph_values.yml
+++ b/datasets/GM0118_hoogeveen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.19755345
+  max_demand: 197.55345
 energy_production_oily_biomass:
-  max_demand: 0.033818163
+  max_demand: 33.81816
 energy_production_wet_biomass:
-  max_demand: 0.2697837
+  max_demand: 269.7837
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0119_meppel/GM0119_meppel.derived.ad b/datasets/GM0119_meppel/GM0119_meppel.derived.ad
index acf2dcece7..62692689cb 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 = 126825
-- parent_id = 126825
+- id = 127274
+- parent_id = 127274
 - 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 a324e60a44..2ea56bba89 100644
--- a/datasets/GM0119_meppel/graph_values.yml
+++ b/datasets/GM0119_meppel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.102560643
+  max_demand: 102.56064
 energy_production_oily_biomass:
-  max_demand: 0.020392239
+  max_demand: 20.39224
 energy_production_wet_biomass:
-  max_demand: 0.148439297
+  max_demand: 148.4393
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0141_almelo/GM0141_almelo.derived.ad b/datasets/GM0141_almelo/GM0141_almelo.derived.ad
index 42dece05d1..8c0793fee4 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 = 126661
-- parent_id = 126661
+- id = 127110
+- parent_id = 127110
 - 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 312181c72e..7967478f62 100644
--- a/datasets/GM0141_almelo/graph_values.yml
+++ b/datasets/GM0141_almelo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.22426839
+  max_demand: 224.26839
 energy_production_oily_biomass:
-  max_demand: 0.044260345
+  max_demand: 44.26035
 energy_production_wet_biomass:
-  max_demand: 0.218592151
+  max_demand: 218.59215
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0147_borne/GM0147_borne.derived.ad b/datasets/GM0147_borne/GM0147_borne.derived.ad
index 6089966367..c74b82e7e0 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 = 126695
-- parent_id = 126695
+- id = 127144
+- parent_id = 127144
 - 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 2891130311..7ff5dcd435 100644
--- a/datasets/GM0147_borne/graph_values.yml
+++ b/datasets/GM0147_borne/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.06674801
+  max_demand: 66.74801
 energy_production_oily_biomass:
-  max_demand: 0.014101533
+  max_demand: 14.10153
 energy_production_wet_biomass:
-  max_demand: 0.068191568
+  max_demand: 68.19157
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad b/datasets/GM0148_dalfsen/GM0148_dalfsen.derived.ad
index c309179ecf..02301929c7 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 = 126710
-- parent_id = 126710
+- id = 127159
+- parent_id = 127159
 - 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 7625c08ab3..b87a6c68b8 100644
--- a/datasets/GM0148_dalfsen/graph_values.yml
+++ b/datasets/GM0148_dalfsen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.179927093
+  max_demand: 179.92709
 energy_production_oily_biomass:
-  max_demand: 0.017314933
+  max_demand: 17.31493
 energy_production_wet_biomass:
-  max_demand: 0.381795394
+  max_demand: 381.79539
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0150_deventer/GM0150_deventer.derived.ad b/datasets/GM0150_deventer/GM0150_deventer.derived.ad
index a45ade753e..2469c46091 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 = 126720
-- parent_id = 126720
+- id = 127169
+- parent_id = 127169
 - 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 72f0729671..8dde09d98a 100644
--- a/datasets/GM0150_deventer/graph_values.yml
+++ b/datasets/GM0150_deventer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.347770519
+  max_demand: 347.77052
 energy_production_oily_biomass:
-  max_demand: 0.060730159
+  max_demand: 60.73016
 energy_production_wet_biomass:
-  max_demand: 0.390080315
+  max_demand: 390.08032
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0153_enschede/GM0153_enschede.derived.ad b/datasets/GM0153_enschede/GM0153_enschede.derived.ad
index 9e2778ee77..194808166e 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 = 126742
-- parent_id = 126742
+- id = 127191
+- parent_id = 127191
 - 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 a138c0ac7c..9b6fbd6090 100644
--- a/datasets/GM0153_enschede/graph_values.yml
+++ b/datasets/GM0153_enschede/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.461455061
+  max_demand: 461.45506
 energy_production_oily_biomass:
-  max_demand: 0.096593985
+  max_demand: 96.59399
 energy_production_wet_biomass:
-  max_demand: 0.374643825
+  max_demand: 374.64383
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad b/datasets/GM0158_haaksbergen/GM0158_haaksbergen.derived.ad
index 9b60a266cd..f13476c53f 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 = 126759
-- parent_id = 126759
+- id = 127208
+- parent_id = 127208
 - 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 e65dd6c19f..048cb4188b 100644
--- a/datasets/GM0158_haaksbergen/graph_values.yml
+++ b/datasets/GM0158_haaksbergen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.108370593
+  max_demand: 108.37059
 energy_production_oily_biomass:
-  max_demand: 0.014749803
+  max_demand: 14.7498
 energy_production_wet_biomass:
-  max_demand: 0.257756656
+  max_demand: 257.75666
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad b/datasets/GM0160_hardenberg/GM0160_hardenberg.derived.ad
index 8100b46190..d9e283a2a7 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 = 126763
-- parent_id = 126763
+- id = 127212
+- parent_id = 127212
 - 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 fe80935583..43a2f65c1f 100644
--- a/datasets/GM0160_hardenberg/graph_values.yml
+++ b/datasets/GM0160_hardenberg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.412431931
+  max_demand: 412.43193
 energy_production_oily_biomass:
-  max_demand: 0.036802511
+  max_demand: 36.80251
 energy_production_wet_biomass:
-  max_demand: 0.691031424
+  max_demand: 691.03142
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad b/datasets/GM0163_hellendoorn/GM0163_hellendoorn.derived.ad
index f47262fb9e..99b64d1a91 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 = 126775
-- parent_id = 126775
+- id = 127224
+- parent_id = 127224
 - 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 7f87beb6e1..25215d4b99 100644
--- a/datasets/GM0163_hellendoorn/graph_values.yml
+++ b/datasets/GM0163_hellendoorn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.178835774
+  max_demand: 178.83577
 energy_production_oily_biomass:
-  max_demand: 0.02175561
+  max_demand: 21.75561
 energy_production_wet_biomass:
-  max_demand: 0.300837787
+  max_demand: 300.83779
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad b/datasets/GM0164_hengelo/GM0164_hengelo.derived.ad
index 2d4a6b8e6f..ac3c87ca69 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 = 126778
-- parent_id = 126778
+- id = 127227
+- parent_id = 127227
 - 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 c1ace70c6b..30b6e43426 100644
--- a/datasets/GM0164_hengelo/graph_values.yml
+++ b/datasets/GM0164_hengelo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.219712023
+  max_demand: 219.71202
 energy_production_oily_biomass:
-  max_demand: 0.049019992
+  max_demand: 49.01999
 energy_production_wet_biomass:
-  max_demand: 0.178553177
+  max_demand: 178.55318
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0166_kampen/GM0166_kampen.derived.ad b/datasets/GM0166_kampen/GM0166_kampen.derived.ad
index 0d4dbdb39c..bbdfa5cb83 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 = 126794
-- parent_id = 126794
+- id = 127243
+- parent_id = 127243
 - 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 7feef723ec..2338640f33 100644
--- a/datasets/GM0166_kampen/graph_values.yml
+++ b/datasets/GM0166_kampen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.187949388
+  max_demand: 187.94939
 energy_production_oily_biomass:
-  max_demand: 0.032674122
+  max_demand: 32.67412
 energy_production_wet_biomass:
-  max_demand: 0.419517923
+  max_demand: 419.51792
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0168_losser/GM0168_losser.derived.ad b/datasets/GM0168_losser/GM0168_losser.derived.ad
index 26a2e57829..d552d3132f 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 = 126818
-- parent_id = 126818
+- id = 127267
+- parent_id = 127267
 - 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 397d28585e..0dce3dc242 100644
--- a/datasets/GM0168_losser/graph_values.yml
+++ b/datasets/GM0168_losser/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.103282124
+  max_demand: 103.28212
 energy_production_oily_biomass:
-  max_demand: 0.013744287
+  max_demand: 13.74429
 energy_production_wet_biomass:
-  max_demand: 0.199737622
+  max_demand: 199.73762
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad b/datasets/GM0171_noordoostpolder/GM0171_noordoostpolder.derived.ad
index a286b19204..8804978b7b 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 = 126842
-- parent_id = 126842
+- id = 127291
+- parent_id = 127291
 - 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 3966cbcdc9..8d34ba508c 100644
--- a/datasets/GM0171_noordoostpolder/graph_values.yml
+++ b/datasets/GM0171_noordoostpolder/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.306547142
+  max_demand: 306.54714
 energy_production_oily_biomass:
-  max_demand: 0.02847161
+  max_demand: 28.47161
 energy_production_wet_biomass:
-  max_demand: 2.122553205
+  max_demand: 2122.55321
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad b/datasets/GM0173_oldenzaal/GM0173_oldenzaal.derived.ad
index 38df3e7dfb..58f3e39887 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 = 126851
-- parent_id = 126851
+- id = 127300
+- parent_id = 127300
 - 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 5d446815db..59a656a3b1 100644
--- a/datasets/GM0173_oldenzaal/graph_values.yml
+++ b/datasets/GM0173_oldenzaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.086661021
+  max_demand: 86.66102
 energy_production_oily_biomass:
-  max_demand: 0.019344801
+  max_demand: 19.3448
 energy_production_wet_biomass:
-  max_demand: 0.062176951
+  max_demand: 62.17695
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0175_ommen/GM0175_ommen.derived.ad b/datasets/GM0175_ommen/GM0175_ommen.derived.ad
index 4bb2b6ec1d..0b5d6fb6fd 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 = 126853
-- parent_id = 126853
+- id = 127302
+- parent_id = 127302
 - 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 8f581e0d80..37ae2d222f 100644
--- a/datasets/GM0175_ommen/graph_values.yml
+++ b/datasets/GM0175_ommen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.165863958
+  max_demand: 165.86396
 energy_production_oily_biomass:
-  max_demand: 0.010822517
+  max_demand: 10.82252
 energy_production_wet_biomass:
-  max_demand: 0.386863542
+  max_demand: 386.86354
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0177_raalte/GM0177_raalte.derived.ad b/datasets/GM0177_raalte/GM0177_raalte.derived.ad
index 13c0c4808f..bf8f5bf06e 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 = 126871
-- parent_id = 126871
+- id = 127320
+- parent_id = 127320
 - 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 1cdc2032e7..5e6bee9359 100644
--- a/datasets/GM0177_raalte/graph_values.yml
+++ b/datasets/GM0177_raalte/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.215731429
+  max_demand: 215.73143
 energy_production_oily_biomass:
-  max_demand: 0.02279029
+  max_demand: 22.79029
 energy_production_wet_biomass:
-  max_demand: 0.467947441
+  max_demand: 467.94744
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad b/datasets/GM0180_staphorst/GM0180_staphorst.derived.ad
index 1408c52eeb..566c8ddf3c 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 = 126903
-- parent_id = 126903
+- id = 127352
+- parent_id = 127352
 - 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 e52c591ea0..129b458899 100644
--- a/datasets/GM0180_staphorst/graph_values.yml
+++ b/datasets/GM0180_staphorst/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.12466831
+  max_demand: 124.66831
 energy_production_oily_biomass:
-  max_demand: 0.010330391
+  max_demand: 10.33039
 energy_production_wet_biomass:
-  max_demand: 0.272611777
+  max_demand: 272.61178
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad b/datasets/GM0183_tubbergen/GM0183_tubbergen.derived.ad
index 6d7fc2618d..d798489652 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 = 126917
-- parent_id = 126917
+- id = 127366
+- parent_id = 127366
 - 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 e497cc36c8..659f859cc2 100644
--- a/datasets/GM0183_tubbergen/graph_values.yml
+++ b/datasets/GM0183_tubbergen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.162546857
+  max_demand: 162.54686
 energy_production_oily_biomass:
-  max_demand: 0.012926507
+  max_demand: 12.92651
 energy_production_wet_biomass:
-  max_demand: 0.358344147
+  max_demand: 358.34415
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0184_urk/GM0184_urk.derived.ad b/datasets/GM0184_urk/GM0184_urk.derived.ad
index c593931736..a191a3e2ea 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 = 126923
-- parent_id = 126923
+- id = 127372
+- parent_id = 127372
 - 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 7669961100..0353133c3b 100644
--- a/datasets/GM0184_urk/graph_values.yml
+++ b/datasets/GM0184_urk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.102318055
+  max_demand: 102.31806
 energy_production_oily_biomass:
-  max_demand: 0.012614827
+  max_demand: 12.61483
 energy_production_wet_biomass:
-  max_demand: 0.075763154
+  max_demand: 75.76315
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0189_wierden/GM0189_wierden.derived.ad b/datasets/GM0189_wierden/GM0189_wierden.derived.ad
index 77de5fa95b..b109e8b288 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 = 126955
-- parent_id = 126955
+- id = 127404
+- parent_id = 127404
 - 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 10c41a0a25..b5a49235c6 100644
--- a/datasets/GM0189_wierden/graph_values.yml
+++ b/datasets/GM0189_wierden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.125856489
+  max_demand: 125.85649
 energy_production_oily_biomass:
-  max_demand: 0.014794763
+  max_demand: 14.79476
 energy_production_wet_biomass:
-  max_demand: 0.234430538
+  max_demand: 234.43054
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad b/datasets/GM0193_zwolle/GM0193_zwolle.derived.ad
index 010fa05252..3875d7ca19 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 = 126977
-- parent_id = 126977
+- id = 127426
+- parent_id = 127426
 - 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 162e106bf4..33b8ef239d 100644
--- a/datasets/GM0193_zwolle/graph_values.yml
+++ b/datasets/GM0193_zwolle/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.357320329
+  max_demand: 357.32033
 energy_production_oily_biomass:
-  max_demand: 0.077462439
+  max_demand: 77.46244
 energy_production_wet_biomass:
-  max_demand: 0.383969406
+  max_demand: 383.96941
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0197_aalten/GM0197_aalten.derived.ad b/datasets/GM0197_aalten/GM0197_aalten.derived.ad
index ff247a92f4..53cc2a6b94 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 = 126656
-- parent_id = 126656
+- id = 127105
+- parent_id = 127105
 - 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 a4fb3f6825..f91be692e0 100644
--- a/datasets/GM0197_aalten/graph_values.yml
+++ b/datasets/GM0197_aalten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.117792762
+  max_demand: 117.79276
 energy_production_oily_biomass:
-  max_demand: 0.01641088
+  max_demand: 16.41088
 energy_production_wet_biomass:
-  max_demand: 0.246520725
+  max_demand: 246.52073
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad b/datasets/GM0200_apeldoorn/GM0200_apeldoorn.derived.ad
index c61354c18d..91fc1560d5 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 = 126669
-- parent_id = 126669
+- id = 127118
+- parent_id = 127118
 - 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 d606bb4565..69b8f97551 100644
--- a/datasets/GM0200_apeldoorn/graph_values.yml
+++ b/datasets/GM0200_apeldoorn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.609853198
+  max_demand: 609.8532
 energy_production_oily_biomass:
-  max_demand: 0.098695545
+  max_demand: 98.69555
 energy_production_wet_biomass:
-  max_demand: 0.533224598
+  max_demand: 533.2246
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad b/datasets/GM0202_arnhem/GM0202_arnhem.derived.ad
index e6124f9edc..e64186b6ab 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 = 126670
-- parent_id = 126670
+- id = 127119
+- parent_id = 127119
 - 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 e342bb4902..fe5c5e62ff 100644
--- a/datasets/GM0202_arnhem/graph_values.yml
+++ b/datasets/GM0202_arnhem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.460656596
+  max_demand: 460.6566
 energy_production_oily_biomass:
-  max_demand: 0.096763495
+  max_demand: 96.7635
 energy_production_wet_biomass:
-  max_demand: 0.33621995
+  max_demand: 336.21995
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad b/datasets/GM0203_barneveld/GM0203_barneveld.derived.ad
index facd5e397c..ef7e2ba3aa 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 = 126676
-- parent_id = 126676
+- id = 127125
+- parent_id = 127125
 - 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 c435c534e6..fae3409c67 100644
--- a/datasets/GM0203_barneveld/graph_values.yml
+++ b/datasets/GM0203_barneveld/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.463399497
+  max_demand: 463.3995
 energy_production_oily_biomass:
-  max_demand: 0.035221025
+  max_demand: 35.22103
 energy_production_wet_biomass:
-  max_demand: 0.330408501
+  max_demand: 330.4085
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad b/datasets/GM0209_beuningen/GM0209_beuningen.derived.ad
index a05ffaece2..25cba7044e 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 = 126687
-- parent_id = 126687
+- id = 127136
+- parent_id = 127136
 - 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 9000ab5bb9..4081eab2bf 100644
--- a/datasets/GM0209_beuningen/graph_values.yml
+++ b/datasets/GM0209_beuningen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.083252581
+  max_demand: 83.25258
 energy_production_oily_biomass:
-  max_demand: 0.015724941
+  max_demand: 15.72494
 energy_production_wet_biomass:
-  max_demand: 0.099404342
+  max_demand: 99.40434
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0213_brummen/GM0213_brummen.derived.ad b/datasets/GM0213_brummen/GM0213_brummen.derived.ad
index 921527eea2..22ba8f3ddc 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 = 126700
-- parent_id = 126700
+- id = 127149
+- parent_id = 127149
 - 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 39e0df3218..78f9603f1f 100644
--- a/datasets/GM0213_brummen/graph_values.yml
+++ b/datasets/GM0213_brummen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.082156204
+  max_demand: 82.1562
 energy_production_oily_biomass:
-  max_demand: 0.012575336
+  max_demand: 12.57534
 energy_production_wet_biomass:
-  max_demand: 0.146415476
+  max_demand: 146.41548
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0214_buren/GM0214_buren.derived.ad b/datasets/GM0214_buren/GM0214_buren.derived.ad
index 4997950309..b1c06f8742 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 = 126704
-- parent_id = 126704
+- id = 127153
+- parent_id = 127153
 - 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 e7626bd6db..27927da23a 100644
--- a/datasets/GM0214_buren/graph_values.yml
+++ b/datasets/GM0214_buren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.109254342
+  max_demand: 109.25434
 energy_production_oily_biomass:
-  max_demand: 0.016141729
+  max_demand: 16.14173
 energy_production_wet_biomass:
-  max_demand: 0.253289385
+  max_demand: 253.28939
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad b/datasets/GM0216_culemborg/GM0216_culemborg.derived.ad
index a2321560ee..e84f46f16a 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 = 126709
-- parent_id = 126709
+- id = 127158
+- parent_id = 127158
 - 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 8c8b6c38b7..86290cc5b5 100644
--- a/datasets/GM0216_culemborg/graph_values.yml
+++ b/datasets/GM0216_culemborg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.081321026
+  max_demand: 81.32103
 energy_production_oily_biomass:
-  max_demand: 0.017348957
+  max_demand: 17.34896
 energy_production_wet_biomass:
-  max_demand: 0.085904843
+  max_demand: 85.90484
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad b/datasets/GM0221_doesburg/GM0221_doesburg.derived.ad
index 6c3f27fa77..ddad294b5e 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 = 126723
-- parent_id = 126723
+- id = 127172
+- parent_id = 127172
 - 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 f35b5c9659..ac33b55b1f 100644
--- a/datasets/GM0221_doesburg/graph_values.yml
+++ b/datasets/GM0221_doesburg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.032357929
+  max_demand: 32.35793
 energy_production_oily_biomass:
-  max_demand: 0.006773111
+  max_demand: 6.77311
 energy_production_wet_biomass:
-  max_demand: 0.041844985
+  max_demand: 41.84499
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad b/datasets/GM0222_doetinchem/GM0222_doetinchem.derived.ad
index 52f0c3f9bb..54bf85a450 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 = 126724
-- parent_id = 126724
+- id = 127173
+- parent_id = 127173
 - 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 4f6625f4a6..f309e369f1 100644
--- a/datasets/GM0222_doetinchem/graph_values.yml
+++ b/datasets/GM0222_doetinchem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.193408297
+  max_demand: 193.4083
 energy_production_oily_biomass:
-  max_demand: 0.034968279
+  max_demand: 34.96828
 energy_production_wet_biomass:
-  max_demand: 0.224822667
+  max_demand: 224.82267
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0225_druten/GM0225_druten.derived.ad b/datasets/GM0225_druten/GM0225_druten.derived.ad
index 59873a6243..55fc3f7e45 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 = 126730
-- parent_id = 126730
+- id = 127179
+- parent_id = 127179
 - 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 ee1df1169a..19576c81d5 100644
--- a/datasets/GM0225_druten/graph_values.yml
+++ b/datasets/GM0225_druten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.064544694
+  max_demand: 64.54469
 energy_production_oily_biomass:
-  max_demand: 0.011420359
+  max_demand: 11.42036
 energy_production_wet_biomass:
-  max_demand: 0.119652481
+  max_demand: 119.65248
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0226_duiven/GM0226_duiven.derived.ad b/datasets/GM0226_duiven/GM0226_duiven.derived.ad
index 112c973321..7b95436627 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 = 126731
-- parent_id = 126731
+- id = 127180
+- parent_id = 127180
 - 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 ea74351647..44d7cdad9c 100644
--- a/datasets/GM0226_duiven/graph_values.yml
+++ b/datasets/GM0226_duiven/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.075408715
+  max_demand: 75.40872
 energy_production_oily_biomass:
-  max_demand: 0.015390782
+  max_demand: 15.39078
 energy_production_wet_biomass:
-  max_demand: 0.0752663
+  max_demand: 75.2663
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0228_ede/GM0228_ede.derived.ad b/datasets/GM0228_ede/GM0228_ede.derived.ad
index adaa099be1..40d7f7fdca 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 = 126734
-- parent_id = 126734
+- id = 127183
+- parent_id = 127183
 - 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 208e8237d9..f7bfed00fe 100644
--- a/datasets/GM0228_ede/graph_values.yml
+++ b/datasets/GM0228_ede/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.659341561
+  max_demand: 659.34156
 energy_production_oily_biomass:
-  max_demand: 0.070301096
+  max_demand: 70.3011
 energy_production_wet_biomass:
-  max_demand: 0.514019098
+  max_demand: 514.0191
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0230_elburg/GM0230_elburg.derived.ad b/datasets/GM0230_elburg/GM0230_elburg.derived.ad
index db4f6faa22..8426eb2a96 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 = 126739
-- parent_id = 126739
+- id = 127188
+- parent_id = 127188
 - 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 03fcc93c66..df7f62189b 100644
--- a/datasets/GM0230_elburg/graph_values.yml
+++ b/datasets/GM0230_elburg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.086079864
+  max_demand: 86.07986
 energy_production_oily_biomass:
-  max_demand: 0.014026196
+  max_demand: 14.0262
 energy_production_wet_biomass:
-  max_demand: 0.098845995
+  max_demand: 98.846
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0232_epe/GM0232_epe.derived.ad b/datasets/GM0232_epe/GM0232_epe.derived.ad
index 12fa1aea23..6022e41e42 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 = 126743
-- parent_id = 126743
+- id = 127192
+- parent_id = 127192
 - 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 6c27a463ca..cbefedb346 100644
--- a/datasets/GM0232_epe/graph_values.yml
+++ b/datasets/GM0232_epe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.19227472
+  max_demand: 192.27472
 energy_production_oily_biomass:
-  max_demand: 0.02013767
+  max_demand: 20.13767
 energy_production_wet_biomass:
-  max_demand: 0.207689358
+  max_demand: 207.68936
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad b/datasets/GM0233_ermelo/GM0233_ermelo.derived.ad
index 8d61b74fda..8d82463a98 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 = 126744
-- parent_id = 126744
+- id = 127193
+- parent_id = 127193
 - 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 ea1677d49e..0ee2dd2dfa 100644
--- a/datasets/GM0233_ermelo/graph_values.yml
+++ b/datasets/GM0233_ermelo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.114719081
+  max_demand: 114.71908
 energy_production_oily_biomass:
-  max_demand: 0.016317923
+  max_demand: 16.31792
 energy_production_wet_biomass:
-  max_demand: 0.108418483
+  max_demand: 108.41848
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad b/datasets/GM0243_harderwijk/GM0243_harderwijk.derived.ad
index 3d31ba2c7b..f7899ec367 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 = 126764
-- parent_id = 126764
+- id = 127213
+- parent_id = 127213
 - 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 928273b371..3210490cc2 100644
--- a/datasets/GM0243_harderwijk/graph_values.yml
+++ b/datasets/GM0243_harderwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.136117135
+  max_demand: 136.11714
 energy_production_oily_biomass:
-  max_demand: 0.028908447
+  max_demand: 28.90845
 energy_production_wet_biomass:
-  max_demand: 0.095394836
+  max_demand: 95.39484
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0244_hattem/GM0244_hattem.derived.ad b/datasets/GM0244_hattem/GM0244_hattem.derived.ad
index 0df61b87c3..7fa8d68ba4 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 = 126767
-- parent_id = 126767
+- id = 127216
+- parent_id = 127216
 - 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 5fe12be5b4..212a119970 100644
--- a/datasets/GM0244_hattem/graph_values.yml
+++ b/datasets/GM0244_hattem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.037899229
+  max_demand: 37.89923
 energy_production_oily_biomass:
-  max_demand: 0.007395862
+  max_demand: 7.39586
 energy_production_wet_biomass:
-  max_demand: 0.047496669
+  max_demand: 47.49667
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0246_heerde/GM0246_heerde.derived.ad b/datasets/GM0246_heerde/GM0246_heerde.derived.ad
index 47bf90e0a6..2231430a26 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 = 126770
-- parent_id = 126770
+- id = 127219
+- parent_id = 127219
 - 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 781a2e0760..f0d8059ae2 100644
--- a/datasets/GM0246_heerde/graph_values.yml
+++ b/datasets/GM0246_heerde/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.083847732
+  max_demand: 83.84773
 energy_production_oily_biomass:
-  max_demand: 0.01126786
+  max_demand: 11.26786
 energy_production_wet_biomass:
-  max_demand: 0.117206743
+  max_demand: 117.20674
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0252_heumen/GM0252_heumen.derived.ad b/datasets/GM0252_heumen/GM0252_heumen.derived.ad
index e3d5690e1f..1c0ea9c21e 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 = 126779
-- parent_id = 126779
+- id = 127228
+- parent_id = 127228
 - 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 3a679136bd..24b661fcf7 100644
--- a/datasets/GM0252_heumen/graph_values.yml
+++ b/datasets/GM0252_heumen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.057017617
+  max_demand: 57.01762
 energy_production_oily_biomass:
-  max_demand: 0.010016281
+  max_demand: 10.01628
 energy_production_wet_biomass:
-  max_demand: 0.086056422
+  max_demand: 86.05642
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0262_lochem/GM0262_lochem.derived.ad b/datasets/GM0262_lochem/GM0262_lochem.derived.ad
index 7d7f2c464d..d749e3cd4a 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 = 126815
-- parent_id = 126815
+- id = 127264
+- parent_id = 127264
 - 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 b40594e506..b0cc33f842 100644
--- a/datasets/GM0262_lochem/graph_values.yml
+++ b/datasets/GM0262_lochem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.200508868
+  max_demand: 200.50887
 energy_production_oily_biomass:
-  max_demand: 0.020408036
+  max_demand: 20.40804
 energy_production_wet_biomass:
-  max_demand: 0.407650228
+  max_demand: 407.65023
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad b/datasets/GM0263_maasdriel/GM0263_maasdriel.derived.ad
index d33615d02a..8a08fd9b47 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 = 126819
-- parent_id = 126819
+- id = 127268
+- parent_id = 127268
 - 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 1d13080977..0afd5f71e9 100644
--- a/datasets/GM0263_maasdriel/graph_values.yml
+++ b/datasets/GM0263_maasdriel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.076861762
+  max_demand: 76.86176
 energy_production_oily_biomass:
-  max_demand: 0.015002549
+  max_demand: 15.00255
 energy_production_wet_biomass:
-  max_demand: 0.166064974
+  max_demand: 166.06497
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad b/datasets/GM0267_nijkerk/GM0267_nijkerk.derived.ad
index fb263a244d..072d1f338d 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 = 126837
-- parent_id = 126837
+- id = 127286
+- parent_id = 127286
 - 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 f9963e67e4..98e8d2631f 100644
--- a/datasets/GM0267_nijkerk/graph_values.yml
+++ b/datasets/GM0267_nijkerk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.191287916
+  max_demand: 191.28792
 energy_production_oily_biomass:
-  max_demand: 0.026090571
+  max_demand: 26.09057
 energy_production_wet_biomass:
-  max_demand: 0.169107293
+  max_demand: 169.10729
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad b/datasets/GM0268_nijmegen/GM0268_nijmegen.derived.ad
index b7951ec23b..254b83e552 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 = 126838
-- parent_id = 126838
+- id = 127287
+- parent_id = 127287
 - 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 acdeb50bce..977f062b2c 100644
--- a/datasets/GM0268_nijmegen/graph_values.yml
+++ b/datasets/GM0268_nijmegen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.4620867
+  max_demand: 462.0867
 energy_production_oily_biomass:
-  max_demand: 0.107390377
+  max_demand: 107.39038
 energy_production_wet_biomass:
-  max_demand: 0.310087
+  max_demand: 310.087
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad b/datasets/GM0269_oldebroek/GM0269_oldebroek.derived.ad
index 6614ccf025..4d2deef462 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 = 126850
-- parent_id = 126850
+- id = 127299
+- parent_id = 127299
 - 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 8d9d94626c..95242df528 100644
--- a/datasets/GM0269_oldebroek/graph_values.yml
+++ b/datasets/GM0269_oldebroek/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.097763082
+  max_demand: 97.76308
 energy_production_oily_biomass:
-  max_demand: 0.014337268
+  max_demand: 14.33727
 energy_production_wet_biomass:
-  max_demand: 0.148138604
+  max_demand: 148.1386
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0273_putten/GM0273_putten.derived.ad b/datasets/GM0273_putten/GM0273_putten.derived.ad
index d6cf76a603..6dbbbb04ba 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 = 126870
-- parent_id = 126870
+- id = 127319
+- parent_id = 127319
 - 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 323c1cb35d..10c3783205 100644
--- a/datasets/GM0273_putten/graph_values.yml
+++ b/datasets/GM0273_putten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.153954028
+  max_demand: 153.95403
 energy_production_oily_biomass:
-  max_demand: 0.014701806
+  max_demand: 14.70181
 energy_production_wet_biomass:
-  max_demand: 0.157945134
+  max_demand: 157.94513
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0274_renkum/GM0274_renkum.derived.ad b/datasets/GM0274_renkum/GM0274_renkum.derived.ad
index 2e2fb942dd..c7b547b915 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 = 126873
-- parent_id = 126873
+- id = 127322
+- parent_id = 127322
 - 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 5b7d2af1e8..2f798ec816 100644
--- a/datasets/GM0274_renkum/graph_values.yml
+++ b/datasets/GM0274_renkum/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.098902071
+  max_demand: 98.90207
 energy_production_oily_biomass:
-  max_demand: 0.019017932
+  max_demand: 19.01793
 energy_production_wet_biomass:
-  max_demand: 0.080297641
+  max_demand: 80.29764
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0275_rheden/GM0275_rheden.derived.ad b/datasets/GM0275_rheden/GM0275_rheden.derived.ad
index 52a2d181ff..3fda62775f 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 = 126876
-- parent_id = 126876
+- id = 127325
+- parent_id = 127325
 - 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 82ae1d68c4..00ef14b025 100644
--- a/datasets/GM0275_rheden/graph_values.yml
+++ b/datasets/GM0275_rheden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.151263357
+  max_demand: 151.26336
 energy_production_oily_biomass:
-  max_demand: 0.026514042
+  max_demand: 26.51404
 energy_production_wet_biomass:
-  max_demand: 0.158397334
+  max_demand: 158.39733
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad b/datasets/GM0277_rozendaal/GM0277_rozendaal.derived.ad
index eee795de06..b21bcd562e 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 = 126885
-- parent_id = 126885
+- id = 127334
+- parent_id = 127334
 - 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 b313e9be3d..7103217444 100644
--- a/datasets/GM0277_rozendaal/graph_values.yml
+++ b/datasets/GM0277_rozendaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.022920241
+  max_demand: 22.92024
 energy_production_oily_biomass:
-  max_demand: 0.001004909
+  max_demand: 1.00491
 energy_production_wet_biomass:
-  max_demand: 0.01951638
+  max_demand: 19.51638
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad b/datasets/GM0279_scherpenzeel/GM0279_scherpenzeel.derived.ad
index 9d510ceb2f..cebd549d65 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 = 126888
-- parent_id = 126888
+- id = 127337
+- parent_id = 127337
 - 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 fe8cbdf93d..9d7bad4609 100644
--- a/datasets/GM0279_scherpenzeel/graph_values.yml
+++ b/datasets/GM0279_scherpenzeel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.068900424
+  max_demand: 68.90042
 energy_production_oily_biomass:
-  max_demand: 0.005998468
+  max_demand: 5.99847
 energy_production_wet_biomass:
-  max_demand: 0.036142904
+  max_demand: 36.1429
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0281_tiel/GM0281_tiel.derived.ad b/datasets/GM0281_tiel/GM0281_tiel.derived.ad
index 4d9c4be0b9..cee349ba36 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 = 126915
-- parent_id = 126915
+- id = 127364
+- parent_id = 127364
 - 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 3fb5021b3a..5d0f2f66c5 100644
--- a/datasets/GM0281_tiel/graph_values.yml
+++ b/datasets/GM0281_tiel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.116928934
+  max_demand: 116.92893
 energy_production_oily_biomass:
-  max_demand: 0.025504273
+  max_demand: 25.50427
 energy_production_wet_biomass:
-  max_demand: 0.109258867
+  max_demand: 109.25887
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0285_voorst/GM0285_voorst.derived.ad b/datasets/GM0285_voorst/GM0285_voorst.derived.ad
index 95b5fc99a6..b4bd3d841d 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 = 126941
-- parent_id = 126941
+- id = 127390
+- parent_id = 127390
 - 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 656223e3a0..27eb027739 100644
--- a/datasets/GM0285_voorst/graph_values.yml
+++ b/datasets/GM0285_voorst/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.114665241
+  max_demand: 114.66524
 energy_production_oily_biomass:
-  max_demand: 0.014834862
+  max_demand: 14.83486
 energy_production_wet_biomass:
-  max_demand: 0.26126547
+  max_demand: 261.26547
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad b/datasets/GM0289_wageningen/GM0289_wageningen.derived.ad
index 405c5e0b10..8401c34d65 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 = 126946
-- parent_id = 126946
+- id = 127395
+- parent_id = 127395
 - 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 2e61c7142d..8426468691 100644
--- a/datasets/GM0289_wageningen/graph_values.yml
+++ b/datasets/GM0289_wageningen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.109662579
+  max_demand: 109.66258
 energy_production_oily_biomass:
-  max_demand: 0.023557641
+  max_demand: 23.55764
 energy_production_wet_biomass:
-  max_demand: 0.090706338
+  max_demand: 90.70634
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad b/datasets/GM0293_westervoort/GM0293_westervoort.derived.ad
index c537b492ed..92e32f329d 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 = 126952
-- parent_id = 126952
+- id = 127401
+- parent_id = 127401
 - 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 7900a423c7..3cedb5719e 100644
--- a/datasets/GM0293_westervoort/graph_values.yml
+++ b/datasets/GM0293_westervoort/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.038970671
+  max_demand: 38.97067
 energy_production_oily_biomass:
-  max_demand: 0.009079419
+  max_demand: 9.07942
 energy_production_wet_biomass:
-  max_demand: 0.02856212
+  max_demand: 28.56212
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad b/datasets/GM0294_winterswijk/GM0294_winterswijk.derived.ad
index df2834e9de..4cf867e273 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 = 126959
-- parent_id = 126959
+- id = 127408
+- parent_id = 127408
 - 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 88e411d15f..f826c81dc0 100644
--- a/datasets/GM0294_winterswijk/graph_values.yml
+++ b/datasets/GM0294_winterswijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.13127805
+  max_demand: 131.27805
 energy_production_oily_biomass:
-  max_demand: 0.017560389
+  max_demand: 17.56039
 energy_production_wet_biomass:
-  max_demand: 0.251653786
+  max_demand: 251.65379
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad b/datasets/GM0296_wijchen/GM0296_wijchen.derived.ad
index 92367ae750..a742b5e3b5 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 = 126956
-- parent_id = 126956
+- id = 127405
+- parent_id = 127405
 - 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 2215a2b209..c75af7de9d 100644
--- a/datasets/GM0296_wijchen/graph_values.yml
+++ b/datasets/GM0296_wijchen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.128849688
+  max_demand: 128.84969
 energy_production_oily_biomass:
-  max_demand: 0.024880306
+  max_demand: 24.88031
 energy_production_wet_biomass:
-  max_demand: 0.190682114
+  max_demand: 190.68211
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad b/datasets/GM0297_zaltbommel/GM0297_zaltbommel.derived.ad
index a72bc2dc0c..cbe1b146ee 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 = 126965
-- parent_id = 126965
+- id = 127414
+- parent_id = 127414
 - 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 813c2b5af5..1c5600f421 100644
--- a/datasets/GM0297_zaltbommel/graph_values.yml
+++ b/datasets/GM0297_zaltbommel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.10976381
+  max_demand: 109.76381
 energy_production_oily_biomass:
-  max_demand: 0.01728577
+  max_demand: 17.28577
 energy_production_wet_biomass:
-  max_demand: 0.192271776
+  max_demand: 192.27178
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad b/datasets/GM0299_zevenaar/GM0299_zevenaar.derived.ad
index 74583c2539..4f4c4767e5 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 = 126969
-- parent_id = 126969
+- id = 127418
+- parent_id = 127418
 - 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 c920cf23fb..616ab08af2 100644
--- a/datasets/GM0299_zevenaar/graph_values.yml
+++ b/datasets/GM0299_zevenaar/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.137924571
+  max_demand: 137.92457
 energy_production_oily_biomass:
-  max_demand: 0.026421693
+  max_demand: 26.42169
 energy_production_wet_biomass:
-  max_demand: 0.235904421
+  max_demand: 235.90442
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad b/datasets/GM0301_zutphen/GM0301_zutphen.derived.ad
index 112988c633..5a0c901513 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 = 126974
-- parent_id = 126974
+- id = 127423
+- parent_id = 127423
 - 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 4e60dd9c26..70f4423749 100644
--- a/datasets/GM0301_zutphen/graph_values.yml
+++ b/datasets/GM0301_zutphen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.139128828
+  max_demand: 139.12883
 energy_production_oily_biomass:
-  max_demand: 0.028925459
+  max_demand: 28.92546
 energy_production_wet_biomass:
-  max_demand: 0.132724937
+  max_demand: 132.72494
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad b/datasets/GM0302_nunspeet/GM0302_nunspeet.derived.ad
index c0c1749dea..6173918da8 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 = 126845
-- parent_id = 126845
+- id = 127294
+- parent_id = 127294
 - 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 4b8b509af3..4217515500 100644
--- a/datasets/GM0302_nunspeet/graph_values.yml
+++ b/datasets/GM0302_nunspeet/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.140042773
+  max_demand: 140.04277
 energy_production_oily_biomass:
-  max_demand: 0.016696434
+  max_demand: 16.69643
 energy_production_wet_biomass:
-  max_demand: 0.1456215
+  max_demand: 145.6215
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0303_dronten/GM0303_dronten.derived.ad b/datasets/GM0303_dronten/GM0303_dronten.derived.ad
index 29ba5c30a8..10eebd34bf 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 = 126729
-- parent_id = 126729
+- id = 127178
+- parent_id = 127178
 - 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 23429f8503..80972e67f4 100644
--- a/datasets/GM0303_dronten/graph_values.yml
+++ b/datasets/GM0303_dronten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.303691201
+  max_demand: 303.6912
 energy_production_oily_biomass:
-  max_demand: 0.024797677
+  max_demand: 24.79768
 energy_production_wet_biomass:
-  max_demand: 1.411988003
+  max_demand: 1411.988
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad b/datasets/GM0307_amersfoort/GM0307_amersfoort.derived.ad
index e46327f2da..6355210ba3 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 = 126666
-- parent_id = 126666
+- id = 127115
+- parent_id = 127115
 - 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 017124dc84..f5dad0301a 100644
--- a/datasets/GM0307_amersfoort/graph_values.yml
+++ b/datasets/GM0307_amersfoort/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.412153354
+  max_demand: 412.15335
 energy_production_oily_biomass:
-  max_demand: 0.094953566
+  max_demand: 94.95357
 energy_production_wet_biomass:
-  max_demand: 0.301800759
+  max_demand: 301.80076
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0308_baarn/GM0308_baarn.derived.ad b/datasets/GM0308_baarn/GM0308_baarn.derived.ad
index adcc056e6a..7deba19633 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 = 126674
-- parent_id = 126674
+- id = 127123
+- parent_id = 127123
 - 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 3353af1a1e..f6c4aae0fa 100644
--- a/datasets/GM0308_baarn/graph_values.yml
+++ b/datasets/GM0308_baarn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.081635357
+  max_demand: 81.63536
 energy_production_oily_biomass:
-  max_demand: 0.015047509
+  max_demand: 15.04751
 energy_production_wet_biomass:
-  max_demand: 0.072502328
+  max_demand: 72.50233
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad b/datasets/GM0310_de_bilt/GM0310_de_bilt.derived.ad
index 073adafdb5..24158db650 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 = 126712
-- parent_id = 126712
+- id = 127161
+- parent_id = 127161
 - 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 e55c44c497..08d92f407d 100644
--- a/datasets/GM0310_de_bilt/graph_values.yml
+++ b/datasets/GM0310_de_bilt/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.138087969
+  max_demand: 138.08797
 energy_production_oily_biomass:
-  max_demand: 0.026018271
+  max_demand: 26.01827
 energy_production_wet_biomass:
-  max_demand: 0.147493279
+  max_demand: 147.49328
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad b/datasets/GM0312_bunnik/GM0312_bunnik.derived.ad
index 27adfcc4af..b74b7edd49 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 = 126702
-- parent_id = 126702
+- id = 127151
+- parent_id = 127151
 - 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 02a875af43..10b8d3fc43 100644
--- a/datasets/GM0312_bunnik/graph_values.yml
+++ b/datasets/GM0312_bunnik/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.051672101
+  max_demand: 51.6721
 energy_production_oily_biomass:
-  max_demand: 0.009230095
+  max_demand: 9.2301
 energy_production_wet_biomass:
-  max_demand: 0.092314968
+  max_demand: 92.31497
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad b/datasets/GM0313_bunschoten/GM0313_bunschoten.derived.ad
index 35213763a9..bb25f427e6 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 = 126703
-- parent_id = 126703
+- id = 127152
+- parent_id = 127152
 - 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 6368be47dd..1025c2cfd1 100644
--- a/datasets/GM0313_bunschoten/graph_values.yml
+++ b/datasets/GM0313_bunschoten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.061420414
+  max_demand: 61.42041
 energy_production_oily_biomass:
-  max_demand: 0.013108776
+  max_demand: 13.10878
 energy_production_wet_biomass:
-  max_demand: 0.096149907
+  max_demand: 96.14991
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad b/datasets/GM0317_eemnes/GM0317_eemnes.derived.ad
index e45fd2de08..dfca2a1ae0 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 = 126735
-- parent_id = 126735
+- id = 127184
+- parent_id = 127184
 - 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 2e1da141b4..3f14755408 100644
--- a/datasets/GM0317_eemnes/graph_values.yml
+++ b/datasets/GM0317_eemnes/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.029115339
+  max_demand: 29.11534
 energy_production_oily_biomass:
-  max_demand: 0.00553672
+  max_demand: 5.53672
 energy_production_wet_biomass:
-  max_demand: 0.04835138
+  max_demand: 48.35138
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0321_houten/GM0321_houten.derived.ad b/datasets/GM0321_houten/GM0321_houten.derived.ad
index cca9179ad3..91c9b6afbf 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 = 126789
-- parent_id = 126789
+- id = 127238
+- parent_id = 127238
 - 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 631d788da5..4c2b4f2d36 100644
--- a/datasets/GM0321_houten/graph_values.yml
+++ b/datasets/GM0321_houten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.149558349
+  max_demand: 149.55835
 energy_production_oily_biomass:
-  max_demand: 0.030324069
+  max_demand: 30.32407
 energy_production_wet_biomass:
-  max_demand: 0.177225542
+  max_demand: 177.22554
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0327_leusden/GM0327_leusden.derived.ad b/datasets/GM0327_leusden/GM0327_leusden.derived.ad
index c2a3615631..cfe3984d12 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 = 126812
-- parent_id = 126812
+- id = 127261
+- parent_id = 127261
 - 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 f37f81ab43..006c4083c3 100644
--- a/datasets/GM0327_leusden/graph_values.yml
+++ b/datasets/GM0327_leusden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.104097608
+  max_demand: 104.09761
 energy_production_oily_biomass:
-  max_demand: 0.018245112
+  max_demand: 18.24511
 energy_production_wet_biomass:
-  max_demand: 0.117093284
+  max_demand: 117.09328
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0331_lopik/GM0331_lopik.derived.ad b/datasets/GM0331_lopik/GM0331_lopik.derived.ad
index 2d2eb56d1f..ff479a5902 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 = 126817
-- parent_id = 126817
+- id = 127266
+- parent_id = 127266
 - 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 81bd77b4e3..5a68d596ab 100644
--- a/datasets/GM0331_lopik/graph_values.yml
+++ b/datasets/GM0331_lopik/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.067554153
+  max_demand: 67.55415
 energy_production_oily_biomass:
-  max_demand: 0.008793257
+  max_demand: 8.79326
 energy_production_wet_biomass:
-  max_demand: 0.177147431
+  max_demand: 177.14743
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad b/datasets/GM0335_montfoort/GM0335_montfoort.derived.ad
index 664f15571e..79f9198aa7 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 = 126831
-- parent_id = 126831
+- id = 127280
+- parent_id = 127280
 - 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 1286a7256f..d136652fba 100644
--- a/datasets/GM0335_montfoort/graph_values.yml
+++ b/datasets/GM0335_montfoort/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.045522023
+  max_demand: 45.52202
 energy_production_oily_biomass:
-  max_demand: 0.008503449
+  max_demand: 8.50345
 energy_production_wet_biomass:
-  max_demand: 0.118778628
+  max_demand: 118.77863
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad b/datasets/GM0339_renswoude/GM0339_renswoude.derived.ad
index 78b195e663..a29b5cf541 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 = 126874
-- parent_id = 126874
+- id = 127323
+- parent_id = 127323
 - 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 eb34b45694..229c339a28 100644
--- a/datasets/GM0339_renswoude/graph_values.yml
+++ b/datasets/GM0339_renswoude/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.072506991
+  max_demand: 72.50699
 energy_production_oily_biomass:
-  max_demand: 0.003195173
+  max_demand: 3.19517
 energy_production_wet_biomass:
-  max_demand: 0.054023223
+  max_demand: 54.02322
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad b/datasets/GM0340_rhenen/GM0340_rhenen.derived.ad
index 1e5f97e086..d76b1a4203 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 = 126877
-- parent_id = 126877
+- id = 127326
+- parent_id = 127326
 - 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 39046781f2..250c6476fb 100644
--- a/datasets/GM0340_rhenen/graph_values.yml
+++ b/datasets/GM0340_rhenen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.075890671
+  max_demand: 75.89067
 energy_production_oily_biomass:
-  max_demand: 0.012153687
+  max_demand: 12.15369
 energy_production_wet_biomass:
-  max_demand: 0.090283153
+  max_demand: 90.28315
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0342_soest/GM0342_soest.derived.ad b/datasets/GM0342_soest/GM0342_soest.derived.ad
index e43597c9fc..8eedc67de0 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 = 126899
-- parent_id = 126899
+- id = 127348
+- parent_id = 127348
 - 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 9abf5d640b..21174e99b7 100644
--- a/datasets/GM0342_soest/graph_values.yml
+++ b/datasets/GM0342_soest/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.132428821
+  max_demand: 132.42882
 energy_production_oily_biomass:
-  max_demand: 0.028065758
+  max_demand: 28.06576
 energy_production_wet_biomass:
-  max_demand: 0.102871531
+  max_demand: 102.87153
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad b/datasets/GM0344_utrecht/GM0344_utrecht.derived.ad
index 5281c49a0d..3cbda3e2be 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 = 126924
-- parent_id = 126924
+- id = 127373
+- parent_id = 127373
 - 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 5716cb8a39..b821d5a297 100644
--- a/datasets/GM0344_utrecht/graph_values.yml
+++ b/datasets/GM0344_utrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.901897626
+  max_demand: 901.89763
 energy_production_oily_biomass:
-  max_demand: 0.214388268
+  max_demand: 214.38827
 energy_production_wet_biomass:
-  max_demand: 0.631183803
+  max_demand: 631.1838
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad b/datasets/GM0345_veenendaal/GM0345_veenendaal.derived.ad
index 882ef22e33..3d552e6285 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 = 126930
-- parent_id = 126930
+- id = 127379
+- parent_id = 127379
 - 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 1aa32d6f03..96b3eae8ab 100644
--- a/datasets/GM0345_veenendaal/graph_values.yml
+++ b/datasets/GM0345_veenendaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.16595123
+  max_demand: 165.95123
 energy_production_oily_biomass:
-  max_demand: 0.039849439
+  max_demand: 39.84944
 energy_production_wet_biomass:
-  max_demand: 0.113617964
+  max_demand: 113.61796
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad b/datasets/GM0351_woudenberg/GM0351_woudenberg.derived.ad
index 753e535ea6..0f20f6dfdb 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 = 126963
-- parent_id = 126963
+- id = 127412
+- parent_id = 127412
 - 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 b6d654a765..0625be6e1c 100644
--- a/datasets/GM0351_woudenberg/graph_values.yml
+++ b/datasets/GM0351_woudenberg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.078550005
+  max_demand: 78.55001
 energy_production_oily_biomass:
-  max_demand: 0.007999172
+  max_demand: 7.99917
 energy_production_wet_biomass:
-  max_demand: 0.092237972
+  max_demand: 92.23797
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 09d0803b6b..a2568ea444 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 = 126958
-- parent_id = 126958
+- id = 127407
+- parent_id = 127407
 - 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 d058faabb9..b2da439435 100644
--- a/datasets/GM0352_wijk_bij_duurstede/graph_values.yml
+++ b/datasets/GM0352_wijk_bij_duurstede/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.079812653
+  max_demand: 79.81265
 energy_production_oily_biomass:
-  max_demand: 0.014436908
+  max_demand: 14.43691
 energy_production_wet_biomass:
-  max_demand: 0.125458521
+  max_demand: 125.45852
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad b/datasets/GM0353_ijsselstein/GM0353_ijsselstein.derived.ad
index 75973470dd..8499b847e4 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 = 126792
-- parent_id = 126792
+- id = 127241
+- parent_id = 127241
 - 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 8a69a64024..f11d54482d 100644
--- a/datasets/GM0353_ijsselstein/graph_values.yml
+++ b/datasets/GM0353_ijsselstein/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.090055594
+  max_demand: 90.05559
 energy_production_oily_biomass:
-  max_demand: 0.020754347
+  max_demand: 20.75435
 energy_production_wet_biomass:
-  max_demand: 0.085100249
+  max_demand: 85.10025
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0355_zeist/GM0355_zeist.derived.ad b/datasets/GM0355_zeist/GM0355_zeist.derived.ad
index 8cc7d4e786..67612f7dd6 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 = 126968
-- parent_id = 126968
+- id = 127417
+- parent_id = 127417
 - 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 dc50c42c98..0a7bc14a6b 100644
--- a/datasets/GM0355_zeist/graph_values.yml
+++ b/datasets/GM0355_zeist/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.185267104
+  max_demand: 185.2671
 energy_production_oily_biomass:
-  max_demand: 0.038843922
+  max_demand: 38.84392
 energy_production_wet_biomass:
-  max_demand: 0.130340402
+  max_demand: 130.3404
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad b/datasets/GM0356_nieuwegein/GM0356_nieuwegein.derived.ad
index 601ef12c4b..b7d2273586 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 = 126835
-- parent_id = 126835
+- id = 127284
+- parent_id = 127284
 - 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 cfda28aa34..69ea8c46e3 100644
--- a/datasets/GM0356_nieuwegein/graph_values.yml
+++ b/datasets/GM0356_nieuwegein/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.174682789
+  max_demand: 174.68279
 energy_production_oily_biomass:
-  max_demand: 0.038298331
+  max_demand: 38.29833
 energy_production_wet_biomass:
-  max_demand: 0.126728074
+  max_demand: 126.72807
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad b/datasets/GM0358_aalsmeer/GM0358_aalsmeer.derived.ad
index b02f8e6e46..5affdcf4b3 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 = 126655
-- parent_id = 126655
+- id = 127104
+- parent_id = 127104
 - 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 3853f342ef..92e8293270 100644
--- a/datasets/GM0358_aalsmeer/graph_values.yml
+++ b/datasets/GM0358_aalsmeer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.083722821
+  max_demand: 83.72282
 energy_production_oily_biomass:
-  max_demand: 0.019276754
+  max_demand: 19.27675
 energy_production_wet_biomass:
-  max_demand: 0.192870071
+  max_demand: 192.87007
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad b/datasets/GM0361_alkmaar/GM0361_alkmaar.derived.ad
index 997e9f7e09..6d18c81b45 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 = 126660
-- parent_id = 126660
+- id = 127109
+- parent_id = 127109
 - 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 befec6e650..5d5fa819f9 100644
--- a/datasets/GM0361_alkmaar/graph_values.yml
+++ b/datasets/GM0361_alkmaar/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.317042207
+  max_demand: 317.04221
 energy_production_oily_biomass:
-  max_demand: 0.065955807
+  max_demand: 65.95581
 energy_production_wet_biomass:
-  max_demand: 0.405458657
+  max_demand: 405.45866
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad b/datasets/GM0362_amstelveen/GM0362_amstelveen.derived.ad
index b7a7de297e..aea6e62428 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 = 126667
-- parent_id = 126667
+- id = 127116
+- parent_id = 127116
 - 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 aabcbec267..1db7b1cb66 100644
--- a/datasets/GM0362_amstelveen/graph_values.yml
+++ b/datasets/GM0362_amstelveen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.24417787
+  max_demand: 244.17787
 energy_production_oily_biomass:
-  max_demand: 0.055189793
+  max_demand: 55.18979
 energy_production_wet_biomass:
-  max_demand: 0.199839884
+  max_demand: 199.83988
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad b/datasets/GM0363_amsterdam/GM0363_amsterdam.derived.ad
index b164ea4a1f..4ab2b3c77a 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 = 126668
-- parent_id = 126668
+- id = 127117
+- parent_id = 127117
 - 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 be72d8e771..dfc2034c5c 100644
--- a/datasets/GM0363_amsterdam/graph_values.yml
+++ b/datasets/GM0363_amsterdam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 2.194338857
+  max_demand: 2194.33886
 energy_production_oily_biomass:
-  max_demand: 0.524305465
+  max_demand: 524.30547
 energy_production_wet_biomass:
-  max_demand: 1.726492962
+  max_demand: 1726.49296
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0370_beemster/GM0370_beemster.derived.ad b/datasets/GM0370_beemster/GM0370_beemster.derived.ad
new file mode 100644
index 0000000000..4f60653d43
--- /dev/null
+++ b/datasets/GM0370_beemster/GM0370_beemster.derived.ad
@@ -0,0 +1,211 @@
+- area = GM0370_beemster
+- id = 127101
+- parent_id = 127101
+- group = country
+- enabled.etengine = true
+- enabled.etmodel = true
+- analysis_year = 2019
+- has_agriculture = true
+- has_semi_detached_houses = true
+- has_coastline = true
+- has_industry = true
+- has_lignite = false
+- has_merit_order = true
+- has_mountains = false
+- has_solar_csp = false
+- has_offshore_solar = true
+- use_merit_order_demands = true
+- has_weather_curves = true
+- has_coal_oil_for_heating_built_environment = false
+- has_aquathermal_potential_for_surface_water = true
+- has_aquathermal_potential_for_waste_water = true
+- has_aquathermal_potential_for_drink_water = true
+- co2_emission_1990_aviation_bunkers = 4.6046
+- co2_emission_1990_marine_bunkers = 34.95619
+- co2_percentage_free = 0.4
+- co2_price = 0.02483
+- captured_biogenic_co2_price = 0.02483
+- offshore_ccs_potential_mt_per_year = 65.0
+- lv_net_spare_capacity = 0.25
+- lv_net_total_costs_present = 838847167.7
+- lv_net_costs_per_capacity_step = 183200.0
+- lv_net_capacity_per_step = 0.2
+- mv_net_spare_capacity = 0.25
+- mv_net_total_costs_present = 720884284.7
+- mv_net_costs_per_capacity_step = 1380000.0
+- mv_net_capacity_per_step = 2.0
+- hv_net_spare_capacity = 0.25
+- hv_net_total_costs_present = 423617819.7
+- hv_net_costs_per_capacity_step = 7280000.0
+- hv_net_capacity_per_step = 20.0
+- lv_mv_trafo_spare_capacity = 0.25
+- lv_mv_trafo_total_costs_present = 298839303.5
+- lv_mv_trafo_costs_per_capacity_step = 40000.0
+- lv_mv_trafo_capacity_per_step = 0.2
+- mv_hv_trafo_spare_capacity = 0.25
+- mv_hv_trafo_total_costs_present = 251654150.3
+- mv_hv_trafo_costs_per_capacity_step = 500000.0
+- mv_hv_trafo_capacity_per_step = 2.0
+- interconnection_net_costs_present = 139550090.5
+- offshore_net_costs_present = 26607183.6
+- flh_solar_pv_solar_radiation_max = 1361.35634547
+- hydrogen_electrolysis_solar_pv_capacity_ratio = 0.426770076
+- present_share_of_apartments_before_1945_in_useful_demand_for_space_heating = 0.0625040726869224
+- present_share_of_apartments_1945_1964_in_useful_demand_for_space_heating = 0.0474523564642453
+- present_share_of_apartments_1965_1984_in_useful_demand_for_space_heating = 0.0953994416233717
+- present_share_of_apartments_1985_2004_in_useful_demand_for_space_heating = 0.0770344579668123
+- present_share_of_apartments_2005_present_in_useful_demand_for_space_heating = 0.0612550022813887
+- present_share_of_detached_houses_before_1945_in_useful_demand_for_space_heating = 0.0370316563248165
+- present_share_of_detached_houses_1945_1964_in_useful_demand_for_space_heating = 0.0185715330739085
+- present_share_of_detached_houses_1965_1984_in_useful_demand_for_space_heating = 0.0297821990506175
+- present_share_of_detached_houses_1985_2004_in_useful_demand_for_space_heating = 0.0327032751808859
+- present_share_of_detached_houses_2005_present_in_useful_demand_for_space_heating = 0.0152188916593297
+- present_share_of_semi_detached_houses_before_1945_in_useful_demand_for_space_heating = 0.0387108078042949
+- present_share_of_semi_detached_houses_1945_1964_in_useful_demand_for_space_heating = 0.0383527943771621
+- present_share_of_semi_detached_houses_1965_1984_in_useful_demand_for_space_heating = 0.072780744915689
+- present_share_of_semi_detached_houses_1985_2004_in_useful_demand_for_space_heating = 0.048605443601013
+- present_share_of_semi_detached_houses_2005_present_in_useful_demand_for_space_heating = 0.0227994495913242
+- present_share_of_terraced_houses_before_1945_in_useful_demand_for_space_heating = 0.0425312979748771
+- present_share_of_terraced_houses_1945_1964_in_useful_demand_for_space_heating = 0.0394372730348244
+- present_share_of_terraced_houses_1965_1984_in_useful_demand_for_space_heating = 0.112216227322524
+- present_share_of_terraced_houses_1985_2004_in_useful_demand_for_space_heating = 0.0761178811197236
+- present_share_of_terraced_houses_2005_present_in_useful_demand_for_space_heating = 0.0314951939462689
+- typical_useful_demand_for_space_heating_apartments_before_1945 = 309.2785
+- typical_useful_demand_for_space_heating_apartments_1945_1964 = 225.7048
+- typical_useful_demand_for_space_heating_apartments_1965_1984 = 193.542
+- typical_useful_demand_for_space_heating_apartments_1985_2004 = 154.5946
+- typical_useful_demand_for_space_heating_apartments_2005_present = 115.9263
+- typical_useful_demand_for_space_heating_apartments_future = 65.0
+- typical_useful_demand_for_space_heating_detached_houses_before_1945 = 296.1239
+- typical_useful_demand_for_space_heating_detached_houses_1945_1964 = 243.2537
+- typical_useful_demand_for_space_heating_detached_houses_1965_1984 = 202.5222
+- typical_useful_demand_for_space_heating_detached_houses_1985_2004 = 160.3984
+- typical_useful_demand_for_space_heating_detached_houses_2005_present = 116.3707
+- typical_useful_demand_for_space_heating_detached_houses_future = 55.0
+- typical_useful_demand_for_space_heating_semi_detached_houses_before_1945 = 268.9665
+- typical_useful_demand_for_space_heating_semi_detached_houses_1945_1964 = 217.0396
+- typical_useful_demand_for_space_heating_semi_detached_houses_1965_1984 = 187.3579
+- typical_useful_demand_for_space_heating_semi_detached_houses_1985_2004 = 154.0974
+- typical_useful_demand_for_space_heating_semi_detached_houses_2005_present = 114.2388
+- typical_useful_demand_for_space_heating_semi_detached_houses_future = 55.0
+- typical_useful_demand_for_space_heating_terraced_houses_before_1945 = 305.0056
+- typical_useful_demand_for_space_heating_terraced_houses_1945_1964 = 280.6464
+- typical_useful_demand_for_space_heating_terraced_houses_1965_1984 = 217.9607
+- typical_useful_demand_for_space_heating_terraced_houses_1985_2004 = 150.8078
+- typical_useful_demand_for_space_heating_terraced_houses_2005_present = 116.2858
+- typical_useful_demand_for_space_heating_terraced_houses_future = 55.0
+- typical_useful_demand_for_space_heating_buildings_present = 243.571
+- typical_useful_demand_for_space_heating_buildings_future = 190.0
+- heat_share_of_apartments_with_block_heating = 0.154
+- heat_infrastructure_households_ht_indoor_investment_costs_apartments_with_block_heating_eur = 4069.0
+- heat_infrastructure_households_ht_indoor_investment_costs_apartments_without_block_heating_eur = 7372.0
+- heat_infrastructure_households_ht_indoor_investment_costs_ground_level_houses_eur = 10080.0
+- heat_exchanger_station_investment_costs_eur_per_kw = 133.0
+- heat_ht_sub_station_investment_costs_eur_per_kw = 50.0
+- heat_ht_distribution_pipelines_investment_costs_eur_per_meter = 1416.0
+- heat_ht_primary_pipelines_investment_costs_per_kw = 216.0
+- heat_infrastructure_households_mt_indoor_investment_costs_apartments_with_block_heating_eur = 4069.0
+- heat_infrastructure_households_mt_indoor_investment_costs_apartments_without_block_heating_eur = 7372.0
+- heat_infrastructure_households_mt_indoor_investment_costs_ground_level_houses_eur = 10080.0
+- heat_mt_sub_station_investment_costs_eur_per_kw = 50.0
+- heat_mt_distribution_pipelines_investment_costs_eur_per_meter = 1818.0
+- heat_mt_primary_pipelines_investment_costs_per_kw = 245.0
+- heat_infrastructure_households_lt_indoor_investment_costs_apartments_with_block_heating_eur = 4069.0
+- heat_infrastructure_households_lt_indoor_investment_costs_apartments_without_block_heating_eur = 7372.0
+- heat_infrastructure_households_lt_indoor_investment_costs_ground_level_houses_eur = 10080.0
+- heat_lt_sub_station_investment_costs_eur_per_kw = 100.0
+- heat_lt_distribution_pipelines_investment_costs_eur_per_meter = 2046.0
+- heat_lt_primary_pipelines_investment_costs_per_kw = 245.0
+- heat_length_of_distribution_pipelines_in_meter_per_residence_object_first_bracket = 3.2
+- heat_length_of_distribution_pipelines_in_meter_per_residence_object_second_bracket = 4.6
+- heat_length_of_distribution_pipelines_in_meter_per_residence_object_third_bracket = 5.8
+- heat_length_of_distribution_pipelines_in_meter_per_residence_object_fourth_bracket = 7.0
+- heat_length_of_distribution_pipelines_in_meter_per_residence_object_fifth_bracket = 10.0
+- heat_length_of_connection_pipelines_in_meter_per_residence_first_bracket = 1.7
+- heat_length_of_connection_pipelines_in_meter_per_residence_second_bracket = 3.5
+- heat_length_of_connection_pipelines_in_meter_per_residence_third_bracket = 5.0
+- heat_length_of_connection_pipelines_in_meter_per_residence_fourth_bracket = 6.3
+- heat_length_of_connection_pipelines_in_meter_per_residence_fifth_bracket = 8.9
+- heat_buildings_indoor_investment_costs_eur_per_kw = 152.0
+- heat_buildings_indoor_investment_costs_eur_per_connection = 7563.0
+- heat_yearly_indoor_infrastructure_maintenance_costs_factor = 0.025
+- heat_yearly_outdoor_infrastructure_maintenance_costs_factor = 0.018
+- households_ht_heat_delivery_system_costs_ground_level_houses_eur_per_connection = 2054.0
+- households_ht_heat_delivery_system_costs_apartments_eur_per_connection = 1174.0
+- households_mt_heat_delivery_system_costs_ground_level_houses_eur_per_connection = 2054.0
+- households_mt_heat_delivery_system_costs_apartments_eur_per_connection = 1174.0
+- households_lt_heat_delivery_system_costs_ground_level_houses_eur_per_connection = 4144.0
+- households_lt_heat_delivery_system_costs_apartments_eur_per_connection = 2382.0
+- buildings_lt_heat_delivery_system_costs_eur_per_connection = 25386.0
+- buildings_mt_heat_delivery_system_costs_eur_per_connection = 16706.0
+- buildings_ht_heat_delivery_system_costs_eur_per_connection = 16706.0
+- aquathermal_potential_for_surface_water = 151.5
+- aquathermal_potential_for_waste_water = 69.9
+- aquathermal_potential_for_drink_water = 5.0
+- area_per_building_residence_equivalent = 293.627703981492
+- electric_vehicle_profile_1_share = 0.24
+- electric_vehicle_profile_2_share = 0.56
+- electric_vehicle_profile_3_share = 0.08
+- electric_vehicle_profile_4_share = 0.12
+- electric_vehicle_profile_5_share = 0.0
+- solar_pv_profile_1_share = 1.0
+- solar_pv_profile_2_share = 0.0
+- annual_infrastructure_cost_gas = 819000.2605576628
+- areable_land = 10.41066653520164
+- co2_emission_1990 = 0.08952541896291569
+- coast_line = 0.25438644456715287
+- interconnector_capacity = 3.2996911324120712
+- total_land_area = 18.99211967853792
+- number_of_cars = 4811.908555659381
+- number_of_busses = 5.471282732375571
+- number_of_trucks = 39.03506407155169
+- number_of_vans = 515.9927261419765
+- present_number_of_residences = 4476.809973844131
+- present_number_of_buildings = 514.693719530362
+- present_number_of_apartments_before_1945 = 304.98058049793883
+- present_number_of_apartments_1945_1964 = 219.60939218082828
+- present_number_of_apartments_1965_1984 = 431.1788189938956
+- present_number_of_apartments_1985_2004 = 349.63809263921416
+- present_number_of_apartments_2005_present = 275.35217437770956
+- present_number_of_detached_houses_before_1945 = 160.88109457132188
+- present_number_of_detached_houses_1945_1964 = 80.73526328851314
+- present_number_of_detached_houses_1965_1984 = 130.39984520456147
+- present_number_of_detached_houses_1985_2004 = 142.46035730596915
+- present_number_of_detached_houses_2005_present = 66.74400883731973
+- present_number_of_semi_detached_houses_before_1945 = 171.06726929956625
+- present_number_of_semi_detached_houses_1945_1964 = 168.50422716184312
+- present_number_of_semi_detached_houses_1965_1984 = 319.0773122554162
+- present_number_of_semi_detached_houses_1985_2004 = 214.17533673302353
+- present_number_of_semi_detached_houses_2005_present = 100.8081023191368
+- present_number_of_terraced_houses_before_1945 = 193.288009839972
+- present_number_of_terraced_houses_1945_1964 = 174.47469393732717
+- present_number_of_terraced_houses_1965_1984 = 493.5937458754439
+- present_number_of_terraced_houses_1985_2004 = 338.7547523999166
+- present_number_of_terraced_houses_2005_present = 141.08689612521303
+- number_of_inhabitants = 9748.0
+- offshore_suitable_for_wind = 16.955335972702027
+- residences_roof_surface_available_for_pv = 0.12409094856934286
+- buildings_roof_surface_available_for_pv = 0.13819219272494998
+- energetic_emissions_other_ghg_industry = 5.9296464939024126e-05
+- energetic_emissions_other_ghg_energy = 0.0005126414921419269
+- energetic_emissions_other_ghg_transport = 0.00018189113613151315
+- energetic_emissions_other_ghg_buildings = 2.7164247547022902e-05
+- energetic_emissions_other_ghg_households = 0.0002047842465552489
+- energetic_emissions_other_ghg_agriculture = 0.0006295722350448842
+- non_energetic_emissions_co2_chemical_industry = 0.0011835842505964096
+- non_energetic_emissions_co2_other_industry = 0.0002406512292263416
+- non_energetic_emissions_co2_agriculture_manure = 2.54826967434574e-05
+- non_energetic_emissions_co2_agriculture_soil_cultivation = 1.9709935051532612e-05
+- non_energetic_emissions_co2_waste_management = 0.0
+- non_energetic_emissions_other_ghg_chemical_industry = 0.001175739801799115
+- non_energetic_emissions_other_ghg_other_industry = 0.0009873793927623526
+- non_energetic_emissions_other_ghg_agriculture_fermentation = 0.004589024008510972
+- non_energetic_emissions_other_ghg_agriculture_manure = 0.0026025459948364102
+- non_energetic_emissions_other_ghg_agriculture_soil_cultivation = 0.002719128888248537
+- non_energetic_emissions_other_ghg_agriculture_other = 0.0
+- non_energetic_emissions_other_ghg_waste_management = 0.0016277821504264251
+- indirect_emissions_co2 = 0.00024317781118717607
+- base_dataset = nl2019
+- scaling.area_attribute = number_of_inhabitants
+- scaling.base_value = 17282163
+- scaling.value = 9748
diff --git a/datasets/GM0370_beemster/graph_values.yml b/datasets/GM0370_beemster/graph_values.yml
new file mode 100644
index 0000000000..8d59faa08a
--- /dev/null
+++ b/datasets/GM0370_beemster/graph_values.yml
@@ -0,0 +1 @@
+--- {}
\ No newline at end of file
diff --git a/datasets/GM0373_bergen/GM0373_bergen.derived.ad b/datasets/GM0373_bergen/GM0373_bergen.derived.ad
index 430849e557..424fa7b3ea 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 = 126682
-- parent_id = 126682
+- id = 127131
+- parent_id = 127131
 - 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 1abea4e1d0..994d833011 100644
--- a/datasets/GM0373_bergen/graph_values.yml
+++ b/datasets/GM0373_bergen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.102250692
+  max_demand: 102.25069
 energy_production_oily_biomass:
-  max_demand: 0.018211089
+  max_demand: 18.21109
 energy_production_wet_biomass:
-  max_demand: 0.11733836
+  max_demand: 117.33836
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad b/datasets/GM0375_beverwijk/GM0375_beverwijk.derived.ad
index 5ee0d075c0..a40aaacbff 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 = 126688
-- parent_id = 126688
+- id = 127137
+- parent_id = 127137
 - 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 c5b0b3113a..df21d3e0d7 100644
--- a/datasets/GM0375_beverwijk/graph_values.yml
+++ b/datasets/GM0375_beverwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.107829379
+  max_demand: 107.82938
 energy_production_oily_biomass:
-  max_demand: 0.025017007
+  max_demand: 25.01701
 energy_production_wet_biomass:
-  max_demand: 0.07621907
+  max_demand: 76.21907
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad b/datasets/GM0376_blaricum/GM0376_blaricum.derived.ad
index e4c2a3eebf..1cd7165a99 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 = 126690
-- parent_id = 126690
+- id = 127139
+- parent_id = 127139
 - 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 bc648c353f..1b11c16fe6 100644
--- a/datasets/GM0376_blaricum/graph_values.yml
+++ b/datasets/GM0376_blaricum/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.032137314
+  max_demand: 32.13731
 energy_production_oily_biomass:
-  max_demand: 0.006805919
+  max_demand: 6.80592
 energy_production_wet_biomass:
-  max_demand: 0.023003791
+  max_demand: 23.00379
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad b/datasets/GM0377_bloemendaal/GM0377_bloemendaal.derived.ad
index a093107aa1..5bf94963d0 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 = 126691
-- parent_id = 126691
+- id = 127140
+- parent_id = 127140
 - 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 9f5f9403c5..370b9dea4e 100644
--- a/datasets/GM0377_bloemendaal/graph_values.yml
+++ b/datasets/GM0377_bloemendaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.070611708
+  max_demand: 70.61171
 energy_production_oily_biomass:
-  max_demand: 0.014223046
+  max_demand: 14.22305
 energy_production_wet_biomass:
-  max_demand: 0.058499526
+  max_demand: 58.49953
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0383_castricum/GM0383_castricum.derived.ad b/datasets/GM0383_castricum/GM0383_castricum.derived.ad
index f1f59361bd..39a67f435d 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 = 126706
-- parent_id = 126706
+- id = 127155
+- parent_id = 127155
 - 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 e4f4066580..4fdea986c6 100644
--- a/datasets/GM0383_castricum/graph_values.yml
+++ b/datasets/GM0383_castricum/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.104336447
+  max_demand: 104.33645
 energy_production_oily_biomass:
-  max_demand: 0.021733738
+  max_demand: 21.73374
 energy_production_wet_biomass:
-  max_demand: 0.151502056
+  max_demand: 151.50206
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0384_diemen/GM0384_diemen.derived.ad b/datasets/GM0384_diemen/GM0384_diemen.derived.ad
index b67b8621e4..527cf30822 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 = 126721
-- parent_id = 126721
+- id = 127170
+- parent_id = 127170
 - 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 734b25b8aa..31cd89da81 100644
--- a/datasets/GM0384_diemen/graph_values.yml
+++ b/datasets/GM0384_diemen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.078655134
+  max_demand: 78.65513
 energy_production_oily_biomass:
-  max_demand: 0.017738405
+  max_demand: 17.73841
 energy_production_wet_biomass:
-  max_demand: 0.062426029
+  max_demand: 62.42603
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad b/datasets/GM0385_edam_volendam/GM0385_edam_volendam.derived.ad
index 073dc6080a..65f56f0acc 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 = 126733
-- parent_id = 126733
+- id = 127182
+- parent_id = 127182
 - 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 12058bfe75..9de704621f 100644
--- a/datasets/GM0385_edam_volendam/graph_values.yml
+++ b/datasets/GM0385_edam_volendam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.099381128
+  max_demand: 99.38113
 energy_production_oily_biomass:
-  max_demand: 0.021932411
+  max_demand: 21.93241
 energy_production_wet_biomass:
-  max_demand: 0.120892015
+  max_demand: 120.89202
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad b/datasets/GM0388_enkhuizen/GM0388_enkhuizen.derived.ad
index 2850afd54f..22ded38747 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 = 126741
-- parent_id = 126741
+- id = 127190
+- parent_id = 127190
 - 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 0da2b59888..3c6f1c37d0 100644
--- a/datasets/GM0388_enkhuizen/graph_values.yml
+++ b/datasets/GM0388_enkhuizen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.051056048
+  max_demand: 51.05605
 energy_production_oily_biomass:
-  max_demand: 0.011244165
+  max_demand: 11.24417
 energy_production_wet_biomass:
-  max_demand: 0.046223852
+  max_demand: 46.22385
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad b/datasets/GM0392_haarlem/GM0392_haarlem.derived.ad
index 98d2c140f0..7efd349aa4 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 = 126760
-- parent_id = 126760
+- id = 127209
+- parent_id = 127209
 - 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 435654f822..2490fcb8d7 100644
--- a/datasets/GM0392_haarlem/graph_values.yml
+++ b/datasets/GM0392_haarlem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.407501419
+  max_demand: 407.50142
 energy_production_oily_biomass:
-  max_demand: 0.097978621
+  max_demand: 97.97862
 energy_production_wet_biomass:
-  max_demand: 0.289080847
+  max_demand: 289.08085
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad b/datasets/GM0394_haarlemmermeer/GM0394_haarlemmermeer.derived.ad
index 33684addc8..ca6101e1e0 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 = 126761
-- parent_id = 126761
+- id = 127210
+- parent_id = 127210
 - 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 8856d8c1a1..833cf48e0e 100644
--- a/datasets/GM0394_haarlemmermeer/graph_values.yml
+++ b/datasets/GM0394_haarlemmermeer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.473166945
+  max_demand: 473.16695
 energy_production_oily_biomass:
-  max_demand: 0.089960614
+  max_demand: 89.96061
 energy_production_wet_biomass:
-  max_demand: 0.46114545
+  max_demand: 461.14545
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad b/datasets/GM0396_heemskerk/GM0396_heemskerk.derived.ad
index 7fe45c449f..d58a6be579 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 = 126768
-- parent_id = 126768
+- id = 127217
+- parent_id = 127217
 - 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 5db54bae91..14ffc42925 100644
--- a/datasets/GM0396_heemskerk/graph_values.yml
+++ b/datasets/GM0396_heemskerk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.110343573
+  max_demand: 110.34357
 energy_production_oily_biomass:
-  max_demand: 0.023794591
+  max_demand: 23.79459
 energy_production_wet_biomass:
-  max_demand: 0.077706147
+  max_demand: 77.70615
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad b/datasets/GM0397_heemstede/GM0397_heemstede.derived.ad
index 35c98d7d4f..7361879db4 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 = 126769
-- parent_id = 126769
+- id = 127218
+- parent_id = 127218
 - 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 75acc2ab8c..647ef3875f 100644
--- a/datasets/GM0397_heemstede/graph_values.yml
+++ b/datasets/GM0397_heemstede/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.07052604
+  max_demand: 70.52604
 energy_production_oily_biomass:
-  max_demand: 0.01657796
+  max_demand: 16.57796
 energy_production_wet_biomass:
-  max_demand: 0.050883183
+  max_demand: 50.88318
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad b/datasets/GM0399_heiloo/GM0399_heiloo.derived.ad
index ad505effce..f5a05eb6e8 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 = 126774
-- parent_id = 126774
+- id = 127223
+- parent_id = 127223
 - 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 6fb308ea30..6668f921e4 100644
--- a/datasets/GM0399_heiloo/graph_values.yml
+++ b/datasets/GM0399_heiloo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.063384462
+  max_demand: 63.38446
 energy_production_oily_biomass:
-  max_demand: 0.014255854
+  max_demand: 14.25585
 energy_production_wet_biomass:
-  max_demand: 0.054586765
+  max_demand: 54.58677
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad b/datasets/GM0400_den_helder/GM0400_den_helder.derived.ad
index 4710d2be17..731148f7e3 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 = 126718
-- parent_id = 126718
+- id = 127167
+- parent_id = 127167
 - 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 dcc15c05a9..e8a035940c 100644
--- a/datasets/GM0400_den_helder/graph_values.yml
+++ b/datasets/GM0400_den_helder/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.154488539
+  max_demand: 154.48854
 energy_production_oily_biomass:
-  max_demand: 0.033782924
+  max_demand: 33.78292
 energy_production_wet_biomass:
-  max_demand: 0.138427814
+  max_demand: 138.42781
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad b/datasets/GM0402_hilversum/GM0402_hilversum.derived.ad
index ccfbe776c3..261ad551f2 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 = 126783
-- parent_id = 126783
+- id = 127232
+- parent_id = 127232
 - 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 67a19285eb..544a641348 100644
--- a/datasets/GM0402_hilversum/graph_values.yml
+++ b/datasets/GM0402_hilversum/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.23919425
+  max_demand: 239.19425
 energy_production_oily_biomass:
-  max_demand: 0.054825255
+  max_demand: 54.82526
 energy_production_wet_biomass:
-  max_demand: 0.173437449
+  max_demand: 173.43745
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad b/datasets/GM0405_hoorn/GM0405_hoorn.derived.ad
index e58895aa85..ecd59320e6 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 = 126787
-- parent_id = 126787
+- id = 127236
+- parent_id = 127236
 - 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 81dfd34fae..e48cd32b57 100644
--- a/datasets/GM0405_hoorn/graph_values.yml
+++ b/datasets/GM0405_hoorn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.187669365
+  max_demand: 187.66937
 energy_production_oily_biomass:
-  max_demand: 0.044354517
+  max_demand: 44.35452
 energy_production_wet_biomass:
-  max_demand: 0.124219336
+  max_demand: 124.21934
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0406_huizen/GM0406_huizen.derived.ad b/datasets/GM0406_huizen/GM0406_huizen.derived.ad
index b4ba91587e..30d08fac1f 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 = 126790
-- parent_id = 126790
+- id = 127239
+- parent_id = 127239
 - 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 9b3ce12848..a75e21aaa9 100644
--- a/datasets/GM0406_huizen/graph_values.yml
+++ b/datasets/GM0406_huizen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.109524012
+  max_demand: 109.52401
 energy_production_oily_biomass:
-  max_demand: 0.025075941
+  max_demand: 25.07594
 energy_production_wet_biomass:
-  max_demand: 0.07308148
+  max_demand: 73.08148
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad b/datasets/GM0415_landsmeer/GM0415_landsmeer.derived.ad
index aa88ed5e3f..afa9747c51 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 = 126803
-- parent_id = 126803
+- id = 127252
+- parent_id = 127252
 - 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 fb629f1215..58e630ddb4 100644
--- a/datasets/GM0415_landsmeer/graph_values.yml
+++ b/datasets/GM0415_landsmeer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.031844013
+  max_demand: 31.84401
 energy_production_oily_biomass:
-  max_demand: 0.006979682
+  max_demand: 6.97968
 energy_production_wet_biomass:
-  max_demand: 0.101037833
+  max_demand: 101.03783
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0417_laren/GM0417_laren.derived.ad b/datasets/GM0417_laren/GM0417_laren.derived.ad
index 9c4ff2516d..2a04fc7063 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 = 126805
-- parent_id = 126805
+- id = 127254
+- parent_id = 127254
 - 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 4296cee71e..6095968e60 100644
--- a/datasets/GM0417_laren/graph_values.yml
+++ b/datasets/GM0417_laren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.032030384
+  max_demand: 32.03038
 energy_production_oily_biomass:
-  max_demand: 0.006801666
+  max_demand: 6.80167
 energy_production_wet_biomass:
-  max_demand: 0.021415163
+  max_demand: 21.41516
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad b/datasets/GM0420_medemblik/GM0420_medemblik.derived.ad
index adc1d40c8d..5e8481b9db 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 = 126823
-- parent_id = 126823
+- id = 127272
+- parent_id = 127272
 - 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 796859601d..8d59a07157 100644
--- a/datasets/GM0420_medemblik/graph_values.yml
+++ b/datasets/GM0420_medemblik/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.13909779
+  max_demand: 139.09779
 energy_production_oily_biomass:
-  max_demand: 0.027224283
+  max_demand: 27.22428
 energy_production_wet_biomass:
-  max_demand: 0.286227615
+  max_demand: 286.22762
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad b/datasets/GM0431_oostzaan/GM0431_oostzaan.derived.ad
index 07c612d9b4..7d912e62bb 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 = 126857
-- parent_id = 126857
+- id = 127306
+- parent_id = 127306
 - 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 eb8f2a3623..2e5d595a17 100644
--- a/datasets/GM0431_oostzaan/graph_values.yml
+++ b/datasets/GM0431_oostzaan/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.025059125
+  max_demand: 25.05913
 energy_production_oily_biomass:
-  max_demand: 0.005927991
+  max_demand: 5.92799
 energy_production_wet_biomass:
-  max_demand: 0.078277409
+  max_demand: 78.27741
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad b/datasets/GM0432_opmeer/GM0432_opmeer.derived.ad
index 4635368325..e3cbbaf52b 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 = 126858
-- parent_id = 126858
+- id = 127307
+- parent_id = 127307
 - 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 8805c9b4fb..b14783335b 100644
--- a/datasets/GM0432_opmeer/graph_values.yml
+++ b/datasets/GM0432_opmeer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.042337877
+  max_demand: 42.33788
 energy_production_oily_biomass:
-  max_demand: 0.007156483
+  max_demand: 7.15648
 energy_production_wet_biomass:
-  max_demand: 0.102021699
+  max_demand: 102.0217
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad b/datasets/GM0437_ouder_amstel/GM0437_ouder_amstel.derived.ad
index e0e26f9223..90823c109b 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 = 126862
-- parent_id = 126862
+- id = 127311
+- parent_id = 127311
 - 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 a3fbdd0a67..99de4a1181 100644
--- a/datasets/GM0437_ouder_amstel/graph_values.yml
+++ b/datasets/GM0437_ouder_amstel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.040773792
+  max_demand: 40.77379
 energy_production_oily_biomass:
-  max_demand: 0.008454844
+  max_demand: 8.45484
 energy_production_wet_biomass:
-  max_demand: 0.06400262
+  max_demand: 64.00262
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad b/datasets/GM0439_purmerend/GM0439_purmerend.derived.ad
index 72f71b873a..4c7229e6d6 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 = 126869
-- parent_id = 126869
+- id = 127318
+- parent_id = 127318
 - 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 fab6857239..fdb97fdd39 100644
--- a/datasets/GM0439_purmerend/graph_values.yml
+++ b/datasets/GM0439_purmerend/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.208341368
+  max_demand: 208.34137
 energy_production_oily_biomass:
-  max_demand: 0.048676112
+  max_demand: 48.67611
 energy_production_wet_biomass:
-  max_demand: 0.147452558
+  max_demand: 147.45256
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0441_schagen/GM0441_schagen.derived.ad b/datasets/GM0441_schagen/GM0441_schagen.derived.ad
index 9373c213f0..1109093ce7 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 = 126887
-- parent_id = 126887
+- id = 127336
+- parent_id = 127336
 - 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 46a2fea939..f544ef459b 100644
--- a/datasets/GM0441_schagen/graph_values.yml
+++ b/datasets/GM0441_schagen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.152239246
+  max_demand: 152.23925
 energy_production_oily_biomass:
-  max_demand: 0.028283873
+  max_demand: 28.28387
 energy_production_wet_biomass:
-  max_demand: 0.398657334
+  max_demand: 398.65733
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0448_texel/GM0448_texel.derived.ad b/datasets/GM0448_texel/GM0448_texel.derived.ad
index 0e7a4e9573..922f24e7f4 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 = 126912
-- parent_id = 126912
+- id = 127361
+- parent_id = 127361
 - 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 181cb7ea15..da5db09ed0 100644
--- a/datasets/GM0448_texel/graph_values.yml
+++ b/datasets/GM0448_texel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.070931543
+  max_demand: 70.93154
 energy_production_oily_biomass:
-  max_demand: 0.008230654
+  max_demand: 8.23065
 energy_production_wet_biomass:
-  max_demand: 1.445862789
+  max_demand: 1445.86279
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad b/datasets/GM0450_uitgeest/GM0450_uitgeest.derived.ad
index 82be43e945..6fc2b8fe96 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 = 126921
-- parent_id = 126921
+- id = 127370
+- parent_id = 127370
 - 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 104737e996..c074509be5 100644
--- a/datasets/GM0450_uitgeest/graph_values.yml
+++ b/datasets/GM0450_uitgeest/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.037893643
+  max_demand: 37.89364
 energy_production_oily_biomass:
-  max_demand: 0.00821911
+  max_demand: 8.21911
 energy_production_wet_biomass:
-  max_demand: 0.082642618
+  max_demand: 82.64262
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad b/datasets/GM0451_uithoorn/GM0451_uithoorn.derived.ad
index abb854d0c1..31e2393afb 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 = 126922
-- parent_id = 126922
+- id = 127371
+- parent_id = 127371
 - 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 f316dea7d3..c459bca250 100644
--- a/datasets/GM0451_uithoorn/graph_values.yml
+++ b/datasets/GM0451_uithoorn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.079401363
+  max_demand: 79.40136
 energy_production_oily_biomass:
-  max_demand: 0.017876929
+  max_demand: 17.87693
 energy_production_wet_biomass:
-  max_demand: 0.067268063
+  max_demand: 67.26806
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0453_velsen/GM0453_velsen.derived.ad b/datasets/GM0453_velsen/GM0453_velsen.derived.ad
index 1f4212d26d..8bd0afcccf 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 = 126933
-- parent_id = 126933
+- id = 127382
+- parent_id = 127382
 - 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 c532b0b45f..0a6c67911f 100644
--- a/datasets/GM0453_velsen/graph_values.yml
+++ b/datasets/GM0453_velsen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.188949526
+  max_demand: 188.94953
 energy_production_oily_biomass:
-  max_demand: 0.041525705
+  max_demand: 41.52571
 energy_production_wet_biomass:
-  max_demand: 0.162937677
+  max_demand: 162.93768
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad b/datasets/GM0473_zandvoort/GM0473_zandvoort.derived.ad
index dbfcce5e6d..0fef2ec77c 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 = 126966
-- parent_id = 126966
+- id = 127415
+- parent_id = 127415
 - 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 0ebd64c2d6..7f632fc632 100644
--- a/datasets/GM0473_zandvoort/graph_values.yml
+++ b/datasets/GM0473_zandvoort/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.045680434
+  max_demand: 45.68043
 energy_production_oily_biomass:
-  max_demand: 0.010335251
+  max_demand: 10.33525
 energy_production_wet_biomass:
-  max_demand: 0.048425032
+  max_demand: 48.42503
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad b/datasets/GM0479_zaanstad/GM0479_zaanstad.derived.ad
index b2e9cc9264..b196df5e4c 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 = 126964
-- parent_id = 126964
+- id = 127413
+- parent_id = 127413
 - 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 fac84ee18a..aaf19050cf 100644
--- a/datasets/GM0479_zaanstad/graph_values.yml
+++ b/datasets/GM0479_zaanstad/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.402910059
+  max_demand: 402.91006
 energy_production_oily_biomass:
-  max_demand: 0.094709933
+  max_demand: 94.70993
 energy_production_wet_biomass:
-  max_demand: 0.414401548
+  max_demand: 414.40155
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad b/datasets/GM0482_alblasserdam/GM0482_alblasserdam.derived.ad
index a5268c4c09..a69b654383 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 = 126658
-- parent_id = 126658
+- id = 127107
+- parent_id = 127107
 - 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 5bfbcd3c3e..e7d09d3a3f 100644
--- a/datasets/GM0482_alblasserdam/graph_values.yml
+++ b/datasets/GM0482_alblasserdam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.051742699
+  max_demand: 51.7427
 energy_production_oily_biomass:
-  max_demand: 0.012193179
+  max_demand: 12.19318
 energy_production_wet_biomass:
-  max_demand: 0.041201929
+  max_demand: 41.20193
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 71b31fee86..f04c42a75a 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 = 126663
-- parent_id = 126663
+- id = 127112
+- parent_id = 127112
 - 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 23b9f116cf..4bda5a7b0a 100644
--- a/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml
+++ b/datasets/GM0484_alphen_aan_den_rijn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.318283439
+  max_demand: 318.28344
 energy_production_oily_biomass:
-  max_demand: 0.067430969
+  max_demand: 67.43097
 energy_production_wet_biomass:
-  max_demand: 0.406048468
+  max_demand: 406.04847
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad b/datasets/GM0489_barendrecht/GM0489_barendrecht.derived.ad
index 70c0b5cd01..bbe97ac83b 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 = 126675
-- parent_id = 126675
+- id = 127124
+- parent_id = 127124
 - 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 858868cbb9..8faca05aa6 100644
--- a/datasets/GM0489_barendrecht/graph_values.yml
+++ b/datasets/GM0489_barendrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.131095593
+  max_demand: 131.09559
 energy_production_oily_biomass:
-  max_demand: 0.029571906
+  max_demand: 29.57191
 energy_production_wet_biomass:
-  max_demand: 0.092845258
+  max_demand: 92.84526
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad b/datasets/GM0498_drechterland/GM0498_drechterland.derived.ad
index ccee6cb6ff..ac9e0faaff 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 = 126727
-- parent_id = 126727
+- id = 127176
+- parent_id = 127176
 - 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 223007370f..720f1f0e37 100644
--- a/datasets/GM0498_drechterland/graph_values.yml
+++ b/datasets/GM0498_drechterland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.061876527
+  max_demand: 61.87653
 energy_production_oily_biomass:
-  max_demand: 0.011906409
+  max_demand: 11.90641
 energy_production_wet_biomass:
-  max_demand: 0.123428543
+  max_demand: 123.42854
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 6cb0615d6b..a33516dda0 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 = 126705
-- parent_id = 126705
+- id = 127154
+- parent_id = 127154
 - 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 a54bee960b..6bb76a9bc5 100644
--- a/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml
+++ b/datasets/GM0502_capelle_aan_den_ijssel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.174023953
+  max_demand: 174.02395
 energy_production_oily_biomass:
-  max_demand: 0.040596134
+  max_demand: 40.59613
 energy_production_wet_biomass:
-  max_demand: 0.119651038
+  max_demand: 119.65104
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0503_delft/GM0503_delft.derived.ad b/datasets/GM0503_delft/GM0503_delft.derived.ad
index 1750c3df5f..58197663e3 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 = 126716
-- parent_id = 126716
+- id = 127165
+- parent_id = 127165
 - 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 39555408fe..56b12d5dd4 100644
--- a/datasets/GM0503_delft/graph_values.yml
+++ b/datasets/GM0503_delft/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.268071256
+  max_demand: 268.07126
 energy_production_oily_biomass:
-  max_demand: 0.062678005
+  max_demand: 62.67801
 energy_production_wet_biomass:
-  max_demand: 0.187995102
+  max_demand: 187.9951
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad b/datasets/GM0505_dordrecht/GM0505_dordrecht.derived.ad
index 849ef87435..558ff78e4f 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 = 126726
-- parent_id = 126726
+- id = 127175
+- parent_id = 127175
 - 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 f99ad9c4c3..3f73376a4a 100644
--- a/datasets/GM0505_dordrecht/graph_values.yml
+++ b/datasets/GM0505_dordrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.329418148
+  max_demand: 329.41815
 energy_production_oily_biomass:
-  max_demand: 0.072089761
+  max_demand: 72.08976
 energy_production_wet_biomass:
-  max_demand: 0.417769549
+  max_demand: 417.76955
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad b/datasets/GM0512_gorinchem/GM0512_gorinchem.derived.ad
index fd219f1247..40eec36cda 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 = 126755
-- parent_id = 126755
+- id = 127204
+- parent_id = 127204
 - 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 f1d111e475..0baeace55b 100644
--- a/datasets/GM0512_gorinchem/graph_values.yml
+++ b/datasets/GM0512_gorinchem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.099069369
+  max_demand: 99.06937
 energy_production_oily_biomass:
-  max_demand: 0.02228662
+  max_demand: 22.28662
 energy_production_wet_biomass:
-  max_demand: 0.086850655
+  max_demand: 86.85066
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0513_gouda/GM0513_gouda.derived.ad b/datasets/GM0513_gouda/GM0513_gouda.derived.ad
index 0da076ff9d..a1c9b1d0dd 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 = 126756
-- parent_id = 126756
+- id = 127205
+- parent_id = 127205
 - 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 4967fe2904..5bead662ea 100644
--- a/datasets/GM0513_gouda/graph_values.yml
+++ b/datasets/GM0513_gouda/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.184149912
+  max_demand: 184.14991
 energy_production_oily_biomass:
-  max_demand: 0.044462056
+  max_demand: 44.46206
 energy_production_wet_biomass:
-  max_demand: 0.132139149
+  max_demand: 132.13915
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad b/datasets/GM0518_s_gravenhage/GM0518_s_gravenhage.derived.ad
index 53cecbe161..1a17c9be16 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 = 126717
-- parent_id = 126717
+- id = 127166
+- parent_id = 127166
 - 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 cbfdbfc3f0..cc2e135fcd 100644
--- a/datasets/GM0518_s_gravenhage/graph_values.yml
+++ b/datasets/GM0518_s_gravenhage/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 1.347863809
+  max_demand: 1347.86381
 energy_production_oily_biomass:
-  max_demand: 0.326767344
+  max_demand: 326.76734
 energy_production_wet_biomass:
-  max_demand: 0.87632155
+  max_demand: 876.32155
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad b/datasets/GM0523_hardinxveld_giessendam/GM0523_hardinxveld_giessendam.derived.ad
index ee4432c78f..e2f5cc67fc 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 = 126765
-- parent_id = 126765
+- id = 127214
+- parent_id = 127214
 - 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 f6e3ab0a63..ea80468147 100644
--- a/datasets/GM0523_hardinxveld_giessendam/graph_values.yml
+++ b/datasets/GM0523_hardinxveld_giessendam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.048973348
+  max_demand: 48.97335
 energy_production_oily_biomass:
-  max_demand: 0.010967117
+  max_demand: 10.96712
 energy_production_wet_biomass:
-  max_demand: 0.067055028
+  max_demand: 67.05503
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 4723934e2e..e6481ca4b0 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 = 126777
-- parent_id = 126777
+- id = 127226
+- parent_id = 127226
 - 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 8259ec5117..13fb0e181f 100644
--- a/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml
+++ b/datasets/GM0531_hendrik_ido_ambacht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.078222006
+  max_demand: 78.22201
 energy_production_oily_biomass:
-  max_demand: 0.018813791
+  max_demand: 18.81379
 energy_production_wet_biomass:
-  max_demand: 0.053183467
+  max_demand: 53.18347
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad b/datasets/GM0532_stede_broec/GM0532_stede_broec.derived.ad
index 13f3fdefbb..2e43267fa4 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 = 126904
-- parent_id = 126904
+- id = 127353
+- parent_id = 127353
 - 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 96bd0dfc1b..b231262409 100644
--- a/datasets/GM0532_stede_broec/graph_values.yml
+++ b/datasets/GM0532_stede_broec/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.059785565
+  max_demand: 59.78557
 energy_production_oily_biomass:
-  max_demand: 0.013187759
+  max_demand: 13.18776
 energy_production_wet_biomass:
-  max_demand: 0.066069109
+  max_demand: 66.06911
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad b/datasets/GM0534_hillegom/GM0534_hillegom.derived.ad
index e2803a7a43..398457760f 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 = 126781
-- parent_id = 126781
+- id = 127230
+- parent_id = 127230
 - 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 ac646779ef..a08f340c94 100644
--- a/datasets/GM0534_hillegom/graph_values.yml
+++ b/datasets/GM0534_hillegom/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.055402552
+  max_demand: 55.40255
 energy_production_oily_biomass:
-  max_demand: 0.013345725
+  max_demand: 13.34573
 energy_production_wet_biomass:
-  max_demand: 0.047570256
+  max_demand: 47.57026
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad b/datasets/GM0537_katwijk/GM0537_katwijk.derived.ad
index 6df147506c..47184bc964 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 = 126796
-- parent_id = 126796
+- id = 127245
+- parent_id = 127245
 - 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 87e5f9e394..9fb873b28d 100644
--- a/datasets/GM0537_katwijk/graph_values.yml
+++ b/datasets/GM0537_katwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.164886791
+  max_demand: 164.88679
 energy_production_oily_biomass:
-  max_demand: 0.039675068
+  max_demand: 39.67507
 energy_production_wet_biomass:
-  max_demand: 0.121642973
+  max_demand: 121.64297
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 89e86ddb27..49fce4cc98 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 = 126799
-- parent_id = 126799
+- id = 127248
+- parent_id = 127248
 - 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 a3d2fa0bfe..810d5d6cc8 100644
--- a/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml
+++ b/datasets/GM0542_krimpen_aan_den_ijssel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.075603823
+  max_demand: 75.60382
 energy_production_oily_biomass:
-  max_demand: 0.017847766
+  max_demand: 17.84777
 energy_production_wet_biomass:
-  max_demand: 0.056162529
+  max_demand: 56.16253
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0546_leiden/GM0546_leiden.derived.ad b/datasets/GM0546_leiden/GM0546_leiden.derived.ad
index 5a202c1e69..ef6dfd2a1c 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 = 126807
-- parent_id = 126807
+- id = 127256
+- parent_id = 127256
 - 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 45cc2572c6..fc034e0985 100644
--- a/datasets/GM0546_leiden/graph_values.yml
+++ b/datasets/GM0546_leiden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.312411951
+  max_demand: 312.41195
 energy_production_oily_biomass:
-  max_demand: 0.075883991
+  max_demand: 75.88399
 energy_production_wet_biomass:
-  max_demand: 0.210520859
+  max_demand: 210.52086
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad b/datasets/GM0547_leiderdorp/GM0547_leiderdorp.derived.ad
index 7ec456f411..e13297dee9 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 = 126808
-- parent_id = 126808
+- id = 127257
+- parent_id = 127257
 - 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 5452be6f1b..4873ba38b3 100644
--- a/datasets/GM0547_leiderdorp/graph_values.yml
+++ b/datasets/GM0547_leiderdorp/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.070630826
+  max_demand: 70.63083
 energy_production_oily_biomass:
-  max_demand: 0.016470421
+  max_demand: 16.47042
 energy_production_wet_biomass:
-  max_demand: 0.057403092
+  max_demand: 57.40309
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0553_lisse/GM0553_lisse.derived.ad b/datasets/GM0553_lisse/GM0553_lisse.derived.ad
index ba223a04a6..e4bb7a715c 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 = 126814
-- parent_id = 126814
+- id = 127263
+- parent_id = 127263
 - 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 fec81ef9e6..986e14b24c 100644
--- a/datasets/GM0553_lisse/graph_values.yml
+++ b/datasets/GM0553_lisse/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.060258246
+  max_demand: 60.25825
 energy_production_oily_biomass:
-  max_demand: 0.013852433
+  max_demand: 13.85243
 energy_production_wet_biomass:
-  max_demand: 0.052211126
+  max_demand: 52.21113
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad b/datasets/GM0556_maassluis/GM0556_maassluis.derived.ad
index 3a8180394f..9f44134271 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 = 126821
-- parent_id = 126821
+- id = 127270
+- parent_id = 127270
 - 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 30a84afa29..dd636630d6 100644
--- a/datasets/GM0556_maassluis/graph_values.yml
+++ b/datasets/GM0556_maassluis/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.083415055
+  max_demand: 83.41506
 energy_production_oily_biomass:
-  max_demand: 0.019908619
+  max_demand: 19.90862
 energy_production_wet_biomass:
-  max_demand: 0.056751107
+  max_demand: 56.75111
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad b/datasets/GM0569_nieuwkoop/GM0569_nieuwkoop.derived.ad
index 435c620174..3689d17038 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 = 126836
-- parent_id = 126836
+- id = 127285
+- parent_id = 127285
 - 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 022091f056..ba628bb97b 100644
--- a/datasets/GM0569_nieuwkoop/graph_values.yml
+++ b/datasets/GM0569_nieuwkoop/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.093258164
+  max_demand: 93.25816
 energy_production_oily_biomass:
-  max_demand: 0.017393309
+  max_demand: 17.39331
 energy_production_wet_biomass:
-  max_demand: 0.343263225
+  max_demand: 343.26323
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad b/datasets/GM0575_noordwijk/GM0575_noordwijk.derived.ad
index 2a79b53150..ab44b1ead6 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 = 126843
-- parent_id = 126843
+- id = 127292
+- parent_id = 127292
 - 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 de39278d79..77ee838db7 100644
--- a/datasets/GM0575_noordwijk/graph_values.yml
+++ b/datasets/GM0575_noordwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.070540169
+  max_demand: 70.54017
 energy_production_oily_biomass:
-  max_demand: 0.01590235
+  max_demand: 15.90235
 energy_production_wet_biomass:
-  max_demand: 0.050308516
+  max_demand: 50.30852
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad b/datasets/GM0579_oegstgeest/GM0579_oegstgeest.derived.ad
index 4c3815359f..16a07d08f2 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 = 126846
-- parent_id = 126846
+- id = 127295
+- parent_id = 127295
 - 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 1c8229f4cd..834afeb6f8 100644
--- a/datasets/GM0579_oegstgeest/graph_values.yml
+++ b/datasets/GM0579_oegstgeest/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.063053897
+  max_demand: 63.0539
 energy_production_oily_biomass:
-  max_demand: 0.01484033
+  max_demand: 14.84033
 energy_production_wet_biomass:
-  max_demand: 0.047290181
+  max_demand: 47.29018
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad b/datasets/GM0589_oudewater/GM0589_oudewater.derived.ad
index dda391ffad..5293fa294e 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 = 126863
-- parent_id = 126863
+- id = 127312
+- parent_id = 127312
 - 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 8e09176ed9..6547e2c3a0 100644
--- a/datasets/GM0589_oudewater/graph_values.yml
+++ b/datasets/GM0589_oudewater/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.043957704
+  max_demand: 43.9577
 energy_production_oily_biomass:
-  max_demand: 0.006197749
+  max_demand: 6.19775
 energy_production_wet_biomass:
-  max_demand: 0.113550838
+  max_demand: 113.55084
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad b/datasets/GM0590_papendrecht/GM0590_papendrecht.derived.ad
index 0b170944ce..ecf993ee0e 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 = 126865
-- parent_id = 126865
+- id = 127314
+- parent_id = 127314
 - 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 ca8ad22c39..d6e609beeb 100644
--- a/datasets/GM0590_papendrecht/graph_values.yml
+++ b/datasets/GM0590_papendrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.085370599
+  max_demand: 85.3706
 energy_production_oily_biomass:
-  max_demand: 0.019618204
+  max_demand: 19.6182
 energy_production_wet_biomass:
-  max_demand: 0.057024475
+  max_demand: 57.02448
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad b/datasets/GM0597_ridderkerk/GM0597_ridderkerk.derived.ad
index 7fcdb7ec9f..89ec7eb7e3 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 = 126878
-- parent_id = 126878
+- id = 127327
+- parent_id = 127327
 - 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 f5303ef63b..e10747949a 100644
--- a/datasets/GM0597_ridderkerk/graph_values.yml
+++ b/datasets/GM0597_ridderkerk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.128027392
+  max_demand: 128.02739
 energy_production_oily_biomass:
-  max_demand: 0.028094313
+  max_demand: 28.09431
 energy_production_wet_biomass:
-  max_demand: 0.086954239
+  max_demand: 86.95424
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad b/datasets/GM0599_rotterdam/GM0599_rotterdam.derived.ad
index 1f761e2894..99616548d5 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 = 126884
-- parent_id = 126884
+- id = 127333
+- parent_id = 127333
 - 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 a1597dc601..2b23d4fa77 100644
--- a/datasets/GM0599_rotterdam/graph_values.yml
+++ b/datasets/GM0599_rotterdam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 1.683706381
+  max_demand: 1683.70638
 energy_production_oily_biomass:
-  max_demand: 0.391645942
+  max_demand: 391.64594
 energy_production_wet_biomass:
-  max_demand: 1.615949957
+  max_demand: 1615.94996
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad b/datasets/GM0603_rijswijk/GM0603_rijswijk.derived.ad
index b02009a93c..f5654ac615 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 = 126880
-- parent_id = 126880
+- id = 127329
+- parent_id = 127329
 - 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 c5f897308a..25234beae6 100644
--- a/datasets/GM0603_rijswijk/graph_values.yml
+++ b/datasets/GM0603_rijswijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.14776885
+  max_demand: 147.76885
 energy_production_oily_biomass:
-  max_demand: 0.032484562
+  max_demand: 32.48456
 energy_production_wet_biomass:
-  max_demand: 0.095146898
+  max_demand: 95.1469
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad b/datasets/GM0606_schiedam/GM0606_schiedam.derived.ad
index 1f551dfcf2..8855289737 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 = 126889
-- parent_id = 126889
+- id = 127338
+- parent_id = 127338
 - 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 959628490e..3509e8037e 100644
--- a/datasets/GM0606_schiedam/graph_values.yml
+++ b/datasets/GM0606_schiedam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.203323097
+  max_demand: 203.3231
 energy_production_oily_biomass:
-  max_demand: 0.047389294
+  max_demand: 47.38929
 energy_production_wet_biomass:
-  max_demand: 0.144260498
+  max_demand: 144.2605
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad b/datasets/GM0610_sliedrecht/GM0610_sliedrecht.derived.ad
index 94cc866155..9c407a4327 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 = 126896
-- parent_id = 126896
+- id = 127345
+- parent_id = 127345
 - 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 9a77a4369d..fe4ce44596 100644
--- a/datasets/GM0610_sliedrecht/graph_values.yml
+++ b/datasets/GM0610_sliedrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.06474627
+  max_demand: 64.74627
 energy_production_oily_biomass:
-  max_demand: 0.015204868
+  max_demand: 15.20487
 energy_production_wet_biomass:
-  max_demand: 0.048059759
+  max_demand: 48.05976
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad b/datasets/GM0613_albrandswaard/GM0613_albrandswaard.derived.ad
index 7cfe1c609f..94b46b8aae 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 = 126659
-- parent_id = 126659
+- id = 127108
+- parent_id = 127108
 - 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 b39cc38c68..a5580ffeca 100644
--- a/datasets/GM0613_albrandswaard/graph_values.yml
+++ b/datasets/GM0613_albrandswaard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.074128048
+  max_demand: 74.12805
 energy_production_oily_biomass:
-  max_demand: 0.01535372
+  max_demand: 15.35372
 energy_production_wet_biomass:
-  max_demand: 0.068674876
+  max_demand: 68.67488
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad b/datasets/GM0622_vlaardingen/GM0622_vlaardingen.derived.ad
index 4654283892..93e37213c6 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 = 126936
-- parent_id = 126936
+- id = 127385
+- parent_id = 127385
 - 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 58719e5583..758a90fa83 100644
--- a/datasets/GM0622_vlaardingen/graph_values.yml
+++ b/datasets/GM0622_vlaardingen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.189264854
+  max_demand: 189.26485
 energy_production_oily_biomass:
-  max_demand: 0.04398998
+  max_demand: 43.98998
 energy_production_wet_biomass:
-  max_demand: 0.136845174
+  max_demand: 136.84517
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad b/datasets/GM0626_voorschoten/GM0626_voorschoten.derived.ad
index c82cd11867..2d4db972cf 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 = 126940
-- parent_id = 126940
+- id = 127389
+- parent_id = 127389
 - 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 c0678b26a3..270b8a5a5a 100644
--- a/datasets/GM0626_voorschoten/graph_values.yml
+++ b/datasets/GM0626_voorschoten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.068853115
+  max_demand: 68.85312
 energy_production_oily_biomass:
-  max_demand: 0.015480094
+  max_demand: 15.48009
 energy_production_wet_biomass:
-  max_demand: 0.050511362
+  max_demand: 50.51136
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad b/datasets/GM0627_waddinxveen/GM0627_waddinxveen.derived.ad
index db8b2c5026..84288f97b0 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 = 126945
-- parent_id = 126945
+- id = 127394
+- parent_id = 127394
 - 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 29b6d638e9..be3106780e 100644
--- a/datasets/GM0627_waddinxveen/graph_values.yml
+++ b/datasets/GM0627_waddinxveen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.084193827
+  max_demand: 84.19383
 energy_production_oily_biomass:
-  max_demand: 0.017203749
+  max_demand: 17.20375
 energy_production_wet_biomass:
-  max_demand: 0.080349604
+  max_demand: 80.3496
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad b/datasets/GM0629_wassenaar/GM0629_wassenaar.derived.ad
index 0aad403e81..aa8fd1dfce 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 = 126947
-- parent_id = 126947
+- id = 127396
+- parent_id = 127396
 - 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 7716063fbf..c9869e7912 100644
--- a/datasets/GM0629_wassenaar/graph_values.yml
+++ b/datasets/GM0629_wassenaar/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.082749088
+  max_demand: 82.74909
 energy_production_oily_biomass:
-  max_demand: 0.01592483
+  max_demand: 15.92483
 energy_production_wet_biomass:
-  max_demand: 0.084603859
+  max_demand: 84.60386
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0632_woerden/GM0632_woerden.derived.ad b/datasets/GM0632_woerden/GM0632_woerden.derived.ad
index d7adf8d4a8..043d57375f 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 = 126961
-- parent_id = 126961
+- id = 127410
+- parent_id = 127410
 - 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 3a4513284b..2dfe6305bc 100644
--- a/datasets/GM0632_woerden/graph_values.yml
+++ b/datasets/GM0632_woerden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.15444704
+  max_demand: 154.44704
 energy_production_oily_biomass:
-  max_demand: 0.031712957
+  max_demand: 31.71296
 energy_production_wet_biomass:
-  max_demand: 0.279898837
+  max_demand: 279.89884
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad b/datasets/GM0637_zoetermeer/GM0637_zoetermeer.derived.ad
index b4f29ac733..631796c5f9 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 = 126970
-- parent_id = 126970
+- id = 127419
+- parent_id = 127419
 - 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 b406686528..a975af7dbd 100644
--- a/datasets/GM0637_zoetermeer/graph_values.yml
+++ b/datasets/GM0637_zoetermeer/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.335464609
+  max_demand: 335.46461
 energy_production_oily_biomass:
-  max_demand: 0.075911331
+  max_demand: 75.91133
 energy_production_wet_biomass:
-  max_demand: 0.239166782
+  max_demand: 239.16678
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad b/datasets/GM0638_zoeterwoude/GM0638_zoeterwoude.derived.ad
index 51b8b22407..2ca4abd912 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 = 126971
-- parent_id = 126971
+- id = 127420
+- parent_id = 127420
 - 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 f832513ba0..b2edfb9fad 100644
--- a/datasets/GM0638_zoeterwoude/graph_values.yml
+++ b/datasets/GM0638_zoeterwoude/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.026889891
+  max_demand: 26.88989
 energy_production_oily_biomass:
-  max_demand: 0.005133906
+  max_demand: 5.13391
 energy_production_wet_biomass:
-  max_demand: 0.058928538
+  max_demand: 58.92854
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad b/datasets/GM0642_zwijndrecht/GM0642_zwijndrecht.derived.ad
index bb0a6c7290..949e888a5e 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 = 126976
-- parent_id = 126976
+- id = 127425
+- parent_id = 127425
 - 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 324a09efa9..1199f01338 100644
--- a/datasets/GM0642_zwijndrecht/graph_values.yml
+++ b/datasets/GM0642_zwijndrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.119010157
+  max_demand: 119.01016
 energy_production_oily_biomass:
-  max_demand: 0.027120998
+  max_demand: 27.121
 energy_production_wet_biomass:
-  max_demand: 0.088153871
+  max_demand: 88.15387
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0654_borsele/GM0654_borsele.derived.ad b/datasets/GM0654_borsele/GM0654_borsele.derived.ad
index c8cc841d27..0684a508a0 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 = 126696
-- parent_id = 126696
+- id = 127145
+- parent_id = 127145
 - 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 58046a6efa..ae2b240d21 100644
--- a/datasets/GM0654_borsele/graph_values.yml
+++ b/datasets/GM0654_borsele/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.125984232
+  max_demand: 125.98423
 energy_production_oily_biomass:
-  max_demand: 0.013852433
+  max_demand: 13.85243
 energy_production_wet_biomass:
-  max_demand: 0.412077752
+  max_demand: 412.07775
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0664_goes/GM0664_goes.derived.ad b/datasets/GM0664_goes/GM0664_goes.derived.ad
index ab857f8f23..65b75c33d8 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 = 126752
-- parent_id = 126752
+- id = 127201
+- parent_id = 127201
 - 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 e262a2f124..65778c2a96 100644
--- a/datasets/GM0664_goes/graph_values.yml
+++ b/datasets/GM0664_goes/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.147211242
+  max_demand: 147.21124
 energy_production_oily_biomass:
-  max_demand: 0.022876564
+  max_demand: 22.87656
 energy_production_wet_biomass:
-  max_demand: 0.285474789
+  max_demand: 285.47479
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 b996e63ac2..e0f275d6e4 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 = 126950
-- parent_id = 126950
+- id = 127399
+- parent_id = 127399
 - 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 791d2b2aa1..5a192a200d 100644
--- a/datasets/GM0668_west_maas_en_waal/graph_values.yml
+++ b/datasets/GM0668_west_maas_en_waal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.086251893
+  max_demand: 86.25189
 energy_production_oily_biomass:
-  max_demand: 0.011589869
+  max_demand: 11.58987
 energy_production_wet_biomass:
-  max_demand: 0.194350145
+  max_demand: 194.35015
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0677_hulst/GM0677_hulst.derived.ad b/datasets/GM0677_hulst/GM0677_hulst.derived.ad
index e919c17b86..cf90aac1b0 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 = 126791
-- parent_id = 126791
+- id = 127240
+- parent_id = 127240
 - 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 ccbcba6580..9c054611f7 100644
--- a/datasets/GM0677_hulst/graph_values.yml
+++ b/datasets/GM0677_hulst/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.169795897
+  max_demand: 169.7959
 energy_production_oily_biomass:
-  max_demand: 0.01672256
+  max_demand: 16.72256
 energy_production_wet_biomass:
-  max_demand: 0.788609254
+  max_demand: 788.60925
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad b/datasets/GM0678_kapelle/GM0678_kapelle.derived.ad
index 7e83d9fab7..fcf2772529 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 = 126795
-- parent_id = 126795
+- id = 127244
+- parent_id = 127244
 - 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 3afa28beaf..2078f9246c 100644
--- a/datasets/GM0678_kapelle/graph_values.yml
+++ b/datasets/GM0678_kapelle/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.04871986
+  max_demand: 48.71986
 energy_production_oily_biomass:
-  max_demand: 0.007767691
+  max_demand: 7.76769
 energy_production_wet_biomass:
-  max_demand: 0.111272019
+  max_demand: 111.27202
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad b/datasets/GM0687_middelburg/GM0687_middelburg.derived.ad
index 6a48f7b153..6b5d91239a 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 = 126826
-- parent_id = 126826
+- id = 127275
+- parent_id = 127275
 - 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 686bafde98..148500e575 100644
--- a/datasets/GM0687_middelburg/graph_values.yml
+++ b/datasets/GM0687_middelburg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.14418573
+  max_demand: 144.18573
 energy_production_oily_biomass:
-  max_demand: 0.02949353
+  max_demand: 29.49353
 energy_production_wet_biomass:
-  max_demand: 1.377164675
+  max_demand: 1377.16468
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad b/datasets/GM0703_reimerswaal/GM0703_reimerswaal.derived.ad
index 6844a09508..bdb109f74f 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 = 126872
-- parent_id = 126872
+- id = 127321
+- parent_id = 127321
 - 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 7a59c5f24b..e4967dc78e 100644
--- a/datasets/GM0703_reimerswaal/graph_values.yml
+++ b/datasets/GM0703_reimerswaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.110359211
+  max_demand: 110.35921
 energy_production_oily_biomass:
-  max_demand: 0.01377831
+  max_demand: 13.77831
 energy_production_wet_biomass:
-  max_demand: 0.395432246
+  max_demand: 395.43225
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad b/datasets/GM0715_terneuzen/GM0715_terneuzen.derived.ad
index e5d667a84b..10c4d3c90c 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 = 126910
-- parent_id = 126910
+- id = 127359
+- parent_id = 127359
 - 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 8b18a63df3..d130eb5d1b 100644
--- a/datasets/GM0715_terneuzen/graph_values.yml
+++ b/datasets/GM0715_terneuzen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.266244989
+  max_demand: 266.24499
 energy_production_oily_biomass:
-  max_demand: 0.033166248
+  max_demand: 33.16625
 energy_production_wet_biomass:
-  max_demand: 0.719336511
+  max_demand: 719.33651
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0716_tholen/GM0716_tholen.derived.ad b/datasets/GM0716_tholen/GM0716_tholen.derived.ad
index e0e76e9b74..d81fe4eb43 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 = 126914
-- parent_id = 126914
+- id = 127363
+- parent_id = 127363
 - 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 c035eaec0a..9881e8ddf1 100644
--- a/datasets/GM0716_tholen/graph_values.yml
+++ b/datasets/GM0716_tholen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.134154359
+  max_demand: 134.15436
 energy_production_oily_biomass:
-  max_demand: 0.01566297
+  max_demand: 15.66297
 energy_production_wet_biomass:
-  max_demand: 0.512079802
+  max_demand: 512.0798
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0717_veere/GM0717_veere.derived.ad b/datasets/GM0717_veere/GM0717_veere.derived.ad
index b6733cc103..65c3cb3483 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 = 126931
-- parent_id = 126931
+- id = 127380
+- parent_id = 127380
 - 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 3048e18b4b..0dddafbdb6 100644
--- a/datasets/GM0717_veere/graph_values.yml
+++ b/datasets/GM0717_veere/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.135382284
+  max_demand: 135.38228
 energy_production_oily_biomass:
-  max_demand: 0.013266135
+  max_demand: 13.26614
 energy_production_wet_biomass:
-  max_demand: 2.639847245
+  max_demand: 2639.84725
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad b/datasets/GM0718_vlissingen/GM0718_vlissingen.derived.ad
index 04d55476bf..c1139f9f42 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 = 126938
-- parent_id = 126938
+- id = 127387
+- parent_id = 127387
 - 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 66ed7087a5..6284e19a14 100644
--- a/datasets/GM0718_vlissingen/graph_values.yml
+++ b/datasets/GM0718_vlissingen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.12208288
+  max_demand: 122.08288
 energy_production_oily_biomass:
-  max_demand: 0.026958171
+  max_demand: 26.95817
 energy_production_wet_biomass:
-  max_demand: 1.308352311
+  max_demand: 1308.35231
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 0884a98eaa..0e166e3f34 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 = 126714
-- parent_id = 126714
+- id = 127163
+- parent_id = 127163
 - 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 42c71562f8..82b629282b 100644
--- a/datasets/GM0736_de_ronde_venen/graph_values.yml
+++ b/datasets/GM0736_de_ronde_venen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.137318306
+  max_demand: 137.31831
 energy_production_oily_biomass:
-  max_demand: 0.026768611
+  max_demand: 26.76861
 energy_production_wet_biomass:
-  max_demand: 0.397282392
+  max_demand: 397.28239
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad b/datasets/GM0737_tytsjerksteradiel/GM0737_tytsjerksteradiel.derived.ad
index 2da6ed2fad..b71dca1746 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 = 126920
-- parent_id = 126920
+- id = 127369
+- parent_id = 127369
 - 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 f6a2ebe7c8..65a6a56a11 100644
--- a/datasets/GM0737_tytsjerksteradiel/graph_values.yml
+++ b/datasets/GM0737_tytsjerksteradiel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.146339835
+  max_demand: 146.33984
 energy_production_oily_biomass:
-  max_demand: 0.019308347
+  max_demand: 19.30835
 energy_production_wet_biomass:
-  max_demand: 0.461839715
+  max_demand: 461.83972
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0743_asten/GM0743_asten.derived.ad b/datasets/GM0743_asten/GM0743_asten.derived.ad
index ab3fd0c041..06cd36ca0b 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 = 126672
-- parent_id = 126672
+- id = 127121
+- parent_id = 127121
 - 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 2356f7c9f4..01a5fb5cd6 100644
--- a/datasets/GM0743_asten/graph_values.yml
+++ b/datasets/GM0743_asten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.152381229
+  max_demand: 152.38123
 energy_production_oily_biomass:
-  max_demand: 0.010152375
+  max_demand: 10.15238
 energy_production_wet_biomass:
-  max_demand: 0.241764765
+  max_demand: 241.76477
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad b/datasets/GM0744_baarle_nassau/GM0744_baarle_nassau.derived.ad
index 4320c734c6..eccecead6d 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 = 126673
-- parent_id = 126673
+- id = 127122
+- parent_id = 127122
 - 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 57e494c032..c49f331dae 100644
--- a/datasets/GM0744_baarle_nassau/graph_values.yml
+++ b/datasets/GM0744_baarle_nassau/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.067345904
+  max_demand: 67.3459
 energy_production_oily_biomass:
-  max_demand: 0.004159983
+  max_demand: 4.15998
 energy_production_wet_biomass:
-  max_demand: 0.209567004
+  max_demand: 209.567
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 e03bbb3d59..f228eda21c 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 = 126683
-- parent_id = 126683
+- id = 127132
+- parent_id = 127132
 - 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 be5dbc31b3..987a6955ad 100644
--- a/datasets/GM0748_bergen_op_zoom/graph_values.yml
+++ b/datasets/GM0748_bergen_op_zoom/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.197323576
+  max_demand: 197.32358
 energy_production_oily_biomass:
-  max_demand: 0.040591881
+  max_demand: 40.59188
 energy_production_wet_biomass:
-  max_demand: 0.393532235
+  max_demand: 393.53224
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0753_best/GM0753_best.derived.ad b/datasets/GM0753_best/GM0753_best.derived.ad
index 4d86521b84..ad875f0093 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 = 126686
-- parent_id = 126686
+- id = 127135
+- parent_id = 127135
 - 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 029187e224..482b8bd710 100644
--- a/datasets/GM0753_best/graph_values.yml
+++ b/datasets/GM0753_best/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.126497781
+  max_demand: 126.49778
 energy_production_oily_biomass:
-  max_demand: 0.018118131
+  max_demand: 18.11813
 energy_production_wet_biomass:
-  max_demand: 0.109654769
+  max_demand: 109.65477
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0755_boekel/GM0755_boekel.derived.ad b/datasets/GM0755_boekel/GM0755_boekel.derived.ad
index b175dea677..cc460712c3 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 = 126693
-- parent_id = 126693
+- id = 127142
+- parent_id = 127142
 - 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 26bb1d8efa..3f62ce5dca 100644
--- a/datasets/GM0755_boekel/graph_values.yml
+++ b/datasets/GM0755_boekel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.063332835
+  max_demand: 63.33284
 energy_production_oily_biomass:
-  max_demand: 0.006432875
+  max_demand: 6.43288
 energy_production_wet_biomass:
-  max_demand: 0.145164499
+  max_demand: 145.1645
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad b/datasets/GM0757_boxtel/GM0757_boxtel.derived.ad
index 4510ac2569..9f935aa933 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 = 126697
-- parent_id = 126697
+- id = 127146
+- parent_id = 127146
 - 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 b90ccb8437..4d36f0a81c 100644
--- a/datasets/GM0757_boxtel/graph_values.yml
+++ b/datasets/GM0757_boxtel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.103611268
+  max_demand: 103.61127
 energy_production_oily_biomass:
-  max_demand: 0.018680735
+  max_demand: 18.68074
 energy_production_wet_biomass:
-  max_demand: 0.175566735
+  max_demand: 175.56674
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0758_breda/GM0758_breda.derived.ad b/datasets/GM0758_breda/GM0758_breda.derived.ad
index 28adc0a137..db770b3da2 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 = 126698
-- parent_id = 126698
+- id = 127147
+- parent_id = 127147
 - 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 e211003cd6..ea96e301bb 100644
--- a/datasets/GM0758_breda/graph_values.yml
+++ b/datasets/GM0758_breda/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.494644198
+  max_demand: 494.6442
 energy_production_oily_biomass:
-  max_demand: 0.111714402
+  max_demand: 111.7144
 energy_production_wet_biomass:
-  max_demand: 0.442136814
+  max_demand: 442.13681
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0762_deurne/GM0762_deurne.derived.ad b/datasets/GM0762_deurne/GM0762_deurne.derived.ad
index c0182741f0..be9606efb7 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 = 126719
-- parent_id = 126719
+- id = 127168
+- parent_id = 127168
 - 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 7439c1f02f..81fc7b9afc 100644
--- a/datasets/GM0762_deurne/graph_values.yml
+++ b/datasets/GM0762_deurne/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.183482185
+  max_demand: 183.48219
 energy_production_oily_biomass:
-  max_demand: 0.019661949
+  max_demand: 19.66195
 energy_production_wet_biomass:
-  max_demand: 0.429564092
+  max_demand: 429.56409
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0765_pekela/GM0765_pekela.derived.ad b/datasets/GM0765_pekela/GM0765_pekela.derived.ad
index ac1599bfcb..8160993bd3 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 = 126867
-- parent_id = 126867
+- id = 127316
+- parent_id = 127316
 - 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 b1a87fbf16..a703cdd0b6 100644
--- a/datasets/GM0765_pekela/graph_values.yml
+++ b/datasets/GM0765_pekela/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.05024792
+  max_demand: 50.24792
 energy_production_oily_biomass:
-  max_demand: 0.007420773
+  max_demand: 7.42077
 energy_production_wet_biomass:
-  max_demand: 0.094469573
+  max_demand: 94.46957
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0766_dongen/GM0766_dongen.derived.ad b/datasets/GM0766_dongen/GM0766_dongen.derived.ad
index 723deb1454..24684a16f8 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 = 126725
-- parent_id = 126725
+- id = 127174
+- parent_id = 127174
 - 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 26a8489272..4fff3e99db 100644
--- a/datasets/GM0766_dongen/graph_values.yml
+++ b/datasets/GM0766_dongen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.07351121
+  max_demand: 73.51121
 energy_production_oily_biomass:
-  max_demand: 0.015827619
+  max_demand: 15.82762
 energy_production_wet_biomass:
-  max_demand: 0.120900882
+  max_demand: 120.90088
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0770_eersel/GM0770_eersel.derived.ad b/datasets/GM0770_eersel/GM0770_eersel.derived.ad
index cf139440e5..445252bdfe 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 = 126736
-- parent_id = 126736
+- id = 127185
+- parent_id = 127185
 - 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 5c20088cde..554366665f 100644
--- a/datasets/GM0770_eersel/graph_values.yml
+++ b/datasets/GM0770_eersel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.148804863
+  max_demand: 148.80486
 energy_production_oily_biomass:
-  max_demand: 0.011610526
+  max_demand: 11.61053
 energy_production_wet_biomass:
-  max_demand: 0.244050611
+  max_demand: 244.05061
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad b/datasets/GM0772_eindhoven/GM0772_eindhoven.derived.ad
index 6c18cdf595..a1722bd0b1 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 = 126738
-- parent_id = 126738
+- id = 127187
+- parent_id = 127187
 - 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 a71e71b348..37270c27b8 100644
--- a/datasets/GM0772_eindhoven/graph_values.yml
+++ b/datasets/GM0772_eindhoven/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.614950744
+  max_demand: 614.95074
 energy_production_oily_biomass:
-  max_demand: 0.140737071
+  max_demand: 140.73707
 energy_production_wet_biomass:
-  max_demand: 0.402680141
+  max_demand: 402.68014
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad b/datasets/GM0777_etten_leur/GM0777_etten_leur.derived.ad
index 17d7214e5b..dd0ec2a32c 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 = 126745
-- parent_id = 126745
+- id = 127194
+- parent_id = 127194
 - 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 91adfb0ed2..c1e5ed0a9a 100644
--- a/datasets/GM0777_etten_leur/graph_values.yml
+++ b/datasets/GM0777_etten_leur/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.126622679
+  max_demand: 126.62268
 energy_production_oily_biomass:
-  max_demand: 0.026595456
+  max_demand: 26.59546
 energy_production_wet_biomass:
-  max_demand: 0.169810439
+  max_demand: 169.81044
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad b/datasets/GM0779_geertruidenberg/GM0779_geertruidenberg.derived.ad
index 8ee5d48843..fe7177a018 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 = 126746
-- parent_id = 126746
+- id = 127195
+- parent_id = 127195
 - 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 32894c47a3..61cb2428d9 100644
--- a/datasets/GM0779_geertruidenberg/graph_values.yml
+++ b/datasets/GM0779_geertruidenberg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.086890726
+  max_demand: 86.89073
 energy_production_oily_biomass:
-  max_demand: 0.013071714
+  max_demand: 13.07171
 energy_production_wet_biomass:
-  max_demand: 0.116463282
+  max_demand: 116.46328
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 bec7ad2c94..d81349bd0b 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 = 126750
-- parent_id = 126750
+- id = 127199
+- parent_id = 127199
 - 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 4e9f97884e..a38ac93e24 100644
--- a/datasets/GM0784_gilze_en_rijen/graph_values.yml
+++ b/datasets/GM0784_gilze_en_rijen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.119896365
+  max_demand: 119.89637
 energy_production_oily_biomass:
-  max_demand: 0.016058493
+  max_demand: 16.05849
 energy_production_wet_biomass:
-  max_demand: 0.163312125
+  max_demand: 163.31213
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0785_goirle/GM0785_goirle.derived.ad b/datasets/GM0785_goirle/GM0785_goirle.derived.ad
index 1c6aa9a95f..1ffcff2669 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 = 126753
-- parent_id = 126753
+- id = 127202
+- parent_id = 127202
 - 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 140c48ebf7..eaf94710db 100644
--- a/datasets/GM0785_goirle/graph_values.yml
+++ b/datasets/GM0785_goirle/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.090162339
+  max_demand: 90.16234
 energy_production_oily_biomass:
-  max_demand: 0.014455743
+  max_demand: 14.45574
 energy_production_wet_biomass:
-  max_demand: 0.112699652
+  max_demand: 112.69965
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0794_helmond/GM0794_helmond.derived.ad b/datasets/GM0794_helmond/GM0794_helmond.derived.ad
index d6b4f4ca45..fe19d17cc8 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 = 126776
-- parent_id = 126776
+- id = 127225
+- parent_id = 127225
 - 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 df3c212458..318b882db6 100644
--- a/datasets/GM0794_helmond/graph_values.yml
+++ b/datasets/GM0794_helmond/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.252590168
+  max_demand: 252.59017
 energy_production_oily_biomass:
-  max_demand: 0.055606581
+  max_demand: 55.60658
 energy_production_wet_biomass:
-  max_demand: 0.198090987
+  max_demand: 198.09099
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
@@ -1141,7 +1141,7 @@ industry_final_demand_for_metal_electricity-industry_final_demand_for_metal_stee
 industry_final_demand_for_metal_network_gas-industry_final_demand_for_metal_aluminium_network_gas@network_gas:
   parent_share: 0.3965722034477919
 industry_final_demand_for_metal_network_gas-industry_final_demand_for_metal_steel_network_gas@network_gas:
-  parent_share: 0.6034277965522081
+  parent_share: 0.603427796552208
 industry_final_demand_for_metal_steam_hot_water-industry_final_demand_for_metal_steel_steam_hot_water@steam_hot_water:
   parent_share: 1.0
 industry_final_demand_for_metal_steel_coal-industry_steel_blastfurnace_bof@coal:
diff --git a/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad b/datasets/GM0796_s_hertogenbosch/GM0796_s_hertogenbosch.derived.ad
index 66c7540d14..7956de738c 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 = 126892
-- parent_id = 126892
+- id = 127341
+- parent_id = 127341
 - 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 f70392b66a..33dbef5329 100644
--- a/datasets/GM0796_s_hertogenbosch/graph_values.yml
+++ b/datasets/GM0796_s_hertogenbosch/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.426963214
+  max_demand: 426.96321
 energy_production_oily_biomass:
-  max_demand: 0.093689227
+  max_demand: 93.68923
 energy_production_wet_biomass:
-  max_demand: 0.472277602
+  max_demand: 472.2776
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0797_heusden/GM0797_heusden.derived.ad b/datasets/GM0797_heusden/GM0797_heusden.derived.ad
index dfd5b4628b..79c8a20fdd 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 = 126780
-- parent_id = 126780
+- id = 127229
+- parent_id = 127229
 - 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 1bbf30a56d..f8017d84c1 100644
--- a/datasets/GM0797_heusden/graph_values.yml
+++ b/datasets/GM0797_heusden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.147775615
+  max_demand: 147.77562
 energy_production_oily_biomass:
-  max_demand: 0.026814786
+  max_demand: 26.81479
 energy_production_wet_biomass:
-  max_demand: 0.181275855
+  max_demand: 181.27586
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad b/datasets/GM0798_hilvarenbeek/GM0798_hilvarenbeek.derived.ad
index 53852477ac..70426357f8 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 = 126782
-- parent_id = 126782
+- id = 127231
+- parent_id = 127231
 - 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 c78e3e0fb4..c6adf9a5ea 100644
--- a/datasets/GM0798_hilvarenbeek/graph_values.yml
+++ b/datasets/GM0798_hilvarenbeek/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.103627093
+  max_demand: 103.62709
 energy_production_oily_biomass:
-  max_demand: 0.009316369
+  max_demand: 9.31637
 energy_production_wet_biomass:
-  max_demand: 0.318382809
+  max_demand: 318.38281
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 af394872a3..d9c99e7534 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 = 126816
-- parent_id = 126816
+- id = 127265
+- parent_id = 127265
 - 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 a19c53ea9e..b544a4d653 100644
--- a/datasets/GM0809_loon_op_zand/graph_values.yml
+++ b/datasets/GM0809_loon_op_zand/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.090596401
+  max_demand: 90.5964
 energy_production_oily_biomass:
-  max_demand: 0.014172618
+  max_demand: 14.17262
 energy_production_wet_biomass:
-  max_demand: 0.09435675
+  max_demand: 94.35675
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 185de182fe..edb6fc1cdd 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 = 126844
-- parent_id = 126844
+- id = 127293
+- parent_id = 127293
 - 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 8156fb718e..8819645307 100644
--- a/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml
+++ b/datasets/GM0820_nuenen_gerwen_en_nederwetten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.054748603
+  max_demand: 54.7486
 energy_production_oily_biomass:
-  max_demand: 0.014086952
+  max_demand: 14.08695
 energy_production_wet_biomass:
-  max_demand: 0.034908809
+  max_demand: 34.90881
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad b/datasets/GM0823_oirschot/GM0823_oirschot.derived.ad
index 0b25cace25..f114160d6c 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 = 126847
-- parent_id = 126847
+- id = 127296
+- parent_id = 127296
 - 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 15b2914e97..9f18be0218 100644
--- a/datasets/GM0823_oirschot/graph_values.yml
+++ b/datasets/GM0823_oirschot/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.150189256
+  max_demand: 150.18926
 energy_production_oily_biomass:
-  max_demand: 0.011314643
+  max_demand: 11.31464
 energy_production_wet_biomass:
-  max_demand: 0.241045416
+  max_demand: 241.04542
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad b/datasets/GM0824_oisterwijk/GM0824_oisterwijk.derived.ad
index a612a5c23a..09676cd265 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 = 126848
-- parent_id = 126848
+- id = 127297
+- parent_id = 127297
 - 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 44c006e0d6..df4bc99804 100644
--- a/datasets/GM0824_oisterwijk/graph_values.yml
+++ b/datasets/GM0824_oisterwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.107234946
+  max_demand: 107.23495
 energy_production_oily_biomass:
-  max_demand: 0.015881693
+  max_demand: 15.88169
 energy_production_wet_biomass:
-  max_demand: 0.186224208
+  max_demand: 186.22421
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad b/datasets/GM0826_oosterhout/GM0826_oosterhout.derived.ad
index fd9c21aa2e..0153dd74ba 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 = 126855
-- parent_id = 126855
+- id = 127304
+- parent_id = 127304
 - 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 2c0b089d76..7701b09c26 100644
--- a/datasets/GM0826_oosterhout/graph_values.yml
+++ b/datasets/GM0826_oosterhout/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.174947453
+  max_demand: 174.94745
 energy_production_oily_biomass:
-  max_demand: 0.033790215
+  max_demand: 33.79022
 energy_production_wet_biomass:
-  max_demand: 0.202387449
+  max_demand: 202.38745
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0828_oss/GM0828_oss.derived.ad b/datasets/GM0828_oss/GM0828_oss.derived.ad
index 2eee86454f..adb9d24ce8 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 = 126860
-- parent_id = 126860
+- id = 127309
+- parent_id = 127309
 - 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 9b9686834d..ccc8216339 100644
--- a/datasets/GM0828_oss/graph_values.yml
+++ b/datasets/GM0828_oss/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.309455363
+  max_demand: 309.45536
 energy_production_oily_biomass:
-  max_demand: 0.055562229
+  max_demand: 55.56223
 energy_production_wet_biomass:
-  max_demand: 0.519908262
+  max_demand: 519.90826
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad b/datasets/GM0840_rucphen/GM0840_rucphen.derived.ad
index a539f5a45c..7f593c127b 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 = 126886
-- parent_id = 126886
+- id = 127335
+- parent_id = 127335
 - 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 93f80f4484..14b7ae03e0 100644
--- a/datasets/GM0840_rucphen/graph_values.yml
+++ b/datasets/GM0840_rucphen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.079790496
+  max_demand: 79.7905
 energy_production_oily_biomass:
-  max_demand: 0.013713908
+  max_demand: 13.71391
 energy_production_wet_biomass:
-  max_demand: 0.15202212
+  max_demand: 152.02212
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad b/datasets/GM0845_sint_michielsgestel/GM0845_sint_michielsgestel.derived.ad
index 94dc823803..cf2cd2e893 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 = 126894
-- parent_id = 126894
+- id = 127343
+- parent_id = 127343
 - 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 2a5a6e93c9..ca7afa6467 100644
--- a/datasets/GM0845_sint_michielsgestel/graph_values.yml
+++ b/datasets/GM0845_sint_michielsgestel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.095095365
+  max_demand: 95.09537
 energy_production_oily_biomass:
-  max_demand: 0.017613854
+  max_demand: 17.61385
 energy_production_wet_biomass:
-  max_demand: 0.156102604
+  max_demand: 156.1026
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0847_someren/GM0847_someren.derived.ad b/datasets/GM0847_someren/GM0847_someren.derived.ad
index 6ad072cf88..093b125296 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 = 126900
-- parent_id = 126900
+- id = 127349
+- parent_id = 127349
 - 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 b2ac74a1c4..5ff5b77727 100644
--- a/datasets/GM0847_someren/graph_values.yml
+++ b/datasets/GM0847_someren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.261759943
+  max_demand: 261.75994
 energy_production_oily_biomass:
-  max_demand: 0.011739329
+  max_demand: 11.73933
 energy_production_wet_biomass:
-  max_demand: 0.239660649
+  max_demand: 239.66065
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 9089da3a15..2724b42356 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 = 126901
-- parent_id = 126901
+- id = 127350
+- parent_id = 127350
 - 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 bada6fa477..3b151b3416 100644
--- a/datasets/GM0848_son_en_breugel/graph_values.yml
+++ b/datasets/GM0848_son_en_breugel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.079455236
+  max_demand: 79.45524
 energy_production_oily_biomass:
-  max_demand: 0.010270242
+  max_demand: 10.27024
 energy_production_wet_biomass:
-  max_demand: 0.055410538
+  max_demand: 55.41054
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad b/datasets/GM0851_steenbergen/GM0851_steenbergen.derived.ad
index 60ec5f8ce0..f50a4f7797 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 = 126905
-- parent_id = 126905
+- id = 127354
+- parent_id = 127354
 - 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 c0f08d993e..91d363f837 100644
--- a/datasets/GM0851_steenbergen/graph_values.yml
+++ b/datasets/GM0851_steenbergen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.128468934
+  max_demand: 128.46893
 energy_production_oily_biomass:
-  max_demand: 0.015221879
+  max_demand: 15.22188
 energy_production_wet_biomass:
-  max_demand: 0.541881523
+  max_demand: 541.88152
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0852_waterland/GM0852_waterland.derived.ad b/datasets/GM0852_waterland/GM0852_waterland.derived.ad
index 415c09c345..c3459627e9 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 = 126948
-- parent_id = 126948
+- id = 127397
+- parent_id = 127397
 - 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 80efff26a8..b2a9fb046d 100644
--- a/datasets/GM0852_waterland/graph_values.yml
+++ b/datasets/GM0852_waterland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.054282244
+  max_demand: 54.28224
 energy_production_oily_biomass:
-  max_demand: 0.010519951
+  max_demand: 10.51995
 energy_production_wet_biomass:
-  max_demand: 0.140706247
+  max_demand: 140.70625
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad b/datasets/GM0855_tilburg/GM0855_tilburg.derived.ad
index b12a63d2a5..08ddaee319 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 = 126916
-- parent_id = 126916
+- id = 127365
+- parent_id = 127365
 - 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 93a8c5860f..c6cbd301f9 100644
--- a/datasets/GM0855_tilburg/graph_values.yml
+++ b/datasets/GM0855_tilburg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.590961376
+  max_demand: 590.96138
 energy_production_oily_biomass:
-  max_demand: 0.131998495
+  max_demand: 131.9985
 energy_production_wet_biomass:
-  max_demand: 0.4558517
+  max_demand: 455.8517
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad b/datasets/GM0858_valkenswaard/GM0858_valkenswaard.derived.ad
index 00c88dbc43..fa05bc9c76 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 = 126928
-- parent_id = 126928
+- id = 127377
+- parent_id = 127377
 - 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 c20b74449d..300afd93f3 100644
--- a/datasets/GM0858_valkenswaard/graph_values.yml
+++ b/datasets/GM0858_valkenswaard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.101727037
+  max_demand: 101.72704
 energy_production_oily_biomass:
-  max_demand: 0.018779767
+  max_demand: 18.77977
 energy_production_wet_biomass:
-  max_demand: 0.144835058
+  max_demand: 144.83506
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad b/datasets/GM0861_veldhoven/GM0861_veldhoven.derived.ad
index 4425351bab..491f21d372 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 = 126932
-- parent_id = 126932
+- id = 127381
+- parent_id = 127381
 - 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 d39864f605..15f6317634 100644
--- a/datasets/GM0861_veldhoven/graph_values.yml
+++ b/datasets/GM0861_veldhoven/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.126056907
+  max_demand: 126.05691
 energy_production_oily_biomass:
-  max_demand: 0.027545076
+  max_demand: 27.54508
 energy_production_wet_biomass:
-  max_demand: 0.100344707
+  max_demand: 100.34471
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0865_vught/GM0865_vught.derived.ad b/datasets/GM0865_vught/GM0865_vught.derived.ad
index 7b3bb5f76d..c4f22853ef 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 = 126942
-- parent_id = 126942
+- id = 127391
+- parent_id = 127391
 - 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 96ef02d548..6ac8556985 100644
--- a/datasets/GM0865_vught/graph_values.yml
+++ b/datasets/GM0865_vught/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.0781498
+  max_demand: 78.1498
 energy_production_oily_biomass:
-  max_demand: 0.016037229
+  max_demand: 16.03723
 energy_production_wet_biomass:
-  max_demand: 0.07672848
+  max_demand: 76.72848
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0866_waalre/GM0866_waalre.derived.ad b/datasets/GM0866_waalre/GM0866_waalre.derived.ad
index 85b49413a0..5fc85026d0 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 = 126943
-- parent_id = 126943
+- id = 127392
+- parent_id = 127392
 - 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 b66162b95f..5f3df57709 100644
--- a/datasets/GM0866_waalre/graph_values.yml
+++ b/datasets/GM0866_waalre/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.053053438
+  max_demand: 53.05344
 energy_production_oily_biomass:
-  max_demand: 0.010478636
+  max_demand: 10.47864
 energy_production_wet_biomass:
-  max_demand: 0.051594358
+  max_demand: 51.59436
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad b/datasets/GM0867_waalwijk/GM0867_waalwijk.derived.ad
index bac2a81186..ca0fb5c62f 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 = 126944
-- parent_id = 126944
+- id = 127393
+- parent_id = 127393
 - 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 9e7fbc5348..b2e1fddc31 100644
--- a/datasets/GM0867_waalwijk/graph_values.yml
+++ b/datasets/GM0867_waalwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.135021927
+  max_demand: 135.02193
 energy_production_oily_biomass:
-  max_demand: 0.029308831
+  max_demand: 29.30883
 energy_production_wet_biomass:
-  max_demand: 0.164096693
+  max_demand: 164.09669
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad b/datasets/GM0873_woensdrecht/GM0873_woensdrecht.derived.ad
index 85df7d3a05..eb95b8d4f6 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 = 126960
-- parent_id = 126960
+- id = 127409
+- parent_id = 127409
 - 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 a4bd43a1fa..2baaf3defc 100644
--- a/datasets/GM0873_woensdrecht/graph_values.yml
+++ b/datasets/GM0873_woensdrecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.105113501
+  max_demand: 105.1135
 energy_production_oily_biomass:
-  max_demand: 0.013284969
+  max_demand: 13.28497
 energy_production_wet_biomass:
-  max_demand: 0.210724924
+  max_demand: 210.72492
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0879_zundert/GM0879_zundert.derived.ad b/datasets/GM0879_zundert/GM0879_zundert.derived.ad
index e66661ddcb..8142c14a35 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 = 126973
-- parent_id = 126973
+- id = 127422
+- parent_id = 127422
 - 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 313cbddf74..6fbf66cb54 100644
--- a/datasets/GM0879_zundert/graph_values.yml
+++ b/datasets/GM0879_zundert/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.131171033
+  max_demand: 131.17103
 energy_production_oily_biomass:
-  max_demand: 0.013130648
+  max_demand: 13.13065
 energy_production_wet_biomass:
-  max_demand: 0.237909868
+  max_demand: 237.90987
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad b/datasets/GM0880_wormerland/GM0880_wormerland.derived.ad
index 49099a2b5b..a6fa84e2a5 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 = 126962
-- parent_id = 126962
+- id = 127411
+- parent_id = 127411
 - 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 83cc420040..cced4afb04 100644
--- a/datasets/GM0880_wormerland/graph_values.yml
+++ b/datasets/GM0880_wormerland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.048548529
+  max_demand: 48.54853
 energy_production_oily_biomass:
-  max_demand: 0.009920894
+  max_demand: 9.92089
 energy_production_wet_biomass:
-  max_demand: 0.144833613
+  max_demand: 144.83361
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad b/datasets/GM0882_landgraaf/GM0882_landgraaf.derived.ad
index 09f14c9089..63e92bc523 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 = 126802
-- parent_id = 126802
+- id = 127251
+- parent_id = 127251
 - 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 1e34bcf6be..0f020b292f 100644
--- a/datasets/GM0882_landgraaf/graph_values.yml
+++ b/datasets/GM0882_landgraaf/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.106601089
+  max_demand: 106.60109
 energy_production_oily_biomass:
-  max_demand: 0.022838895
+  max_demand: 22.8389
 energy_production_wet_biomass:
-  max_demand: 0.070357422
+  max_demand: 70.35742
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0888_beek/GM0888_beek.derived.ad b/datasets/GM0888_beek/GM0888_beek.derived.ad
index bd91da481a..285bbcab16 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 = 126677
-- parent_id = 126677
+- id = 127126
+- parent_id = 127126
 - 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 ac5f0fab8d..cb1e821860 100644
--- a/datasets/GM0888_beek/graph_values.yml
+++ b/datasets/GM0888_beek/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.045229136
+  max_demand: 45.22914
 energy_production_oily_biomass:
-  max_demand: 0.009677868
+  max_demand: 9.67787
 energy_production_wet_biomass:
-  max_demand: 0.046394812
+  max_demand: 46.39481
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0889_beesel/GM0889_beesel.derived.ad b/datasets/GM0889_beesel/GM0889_beesel.derived.ad
index 8286e76dde..716fe93236 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 = 126678
-- parent_id = 126678
+- id = 127127
+- parent_id = 127127
 - 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 1a95494bc6..8b32390fbc 100644
--- a/datasets/GM0889_beesel/graph_values.yml
+++ b/datasets/GM0889_beesel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.043796327
+  max_demand: 43.79633
 energy_production_oily_biomass:
-  max_demand: 0.008213642
+  max_demand: 8.21364
 energy_production_wet_biomass:
-  max_demand: 0.064245334
+  max_demand: 64.24533
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0893_bergen/GM0893_bergen.derived.ad b/datasets/GM0893_bergen/GM0893_bergen.derived.ad
index d4e6daff26..4c9d8e45b3 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 = 126681
-- parent_id = 126681
+- id = 127130
+- parent_id = 127130
 - 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 2c63acaa0c..959ac8a067 100644
--- a/datasets/GM0893_bergen/graph_values.yml
+++ b/datasets/GM0893_bergen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.078750261
+  max_demand: 78.75026
 energy_production_oily_biomass:
-  max_demand: 0.007983376
+  max_demand: 7.98338
 energy_production_wet_biomass:
-  max_demand: 0.198580026
+  max_demand: 198.58003
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad b/datasets/GM0899_brunssum/GM0899_brunssum.derived.ad
index 975b81e258..c45a5bf78a 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 = 126701
-- parent_id = 126701
+- id = 127150
+- parent_id = 127150
 - 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 3dc3b459ca..802bd0546b 100644
--- a/datasets/GM0899_brunssum/graph_values.yml
+++ b/datasets/GM0899_brunssum/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.075994737
+  max_demand: 75.99474
 energy_production_oily_biomass:
-  max_demand: 0.017074338
+  max_demand: 17.07434
 energy_production_wet_biomass:
-  max_demand: 0.0496528
+  max_demand: 49.6528
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0907_gennep/GM0907_gennep.derived.ad b/datasets/GM0907_gennep/GM0907_gennep.derived.ad
index 889fdfa736..dafda1a72b 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 = 126749
-- parent_id = 126749
+- id = 127198
+- parent_id = 127198
 - 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 95c11cdd7e..ab3c60c49a 100644
--- a/datasets/GM0907_gennep/graph_values.yml
+++ b/datasets/GM0907_gennep/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.081326858
+  max_demand: 81.32686
 energy_production_oily_biomass:
-  max_demand: 0.010371705
+  max_demand: 10.37171
 energy_production_wet_biomass:
-  max_demand: 0.10980504
+  max_demand: 109.80504
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad b/datasets/GM0917_heerlen/GM0917_heerlen.derived.ad
index 6e5f4e2059..07fb016cdc 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 = 126772
-- parent_id = 126772
+- id = 127221
+- parent_id = 127221
 - 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 0d7e7122c8..113f6bbde2 100644
--- a/datasets/GM0917_heerlen/graph_values.yml
+++ b/datasets/GM0917_heerlen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.258561995
+  max_demand: 258.562
 energy_production_oily_biomass:
-  max_demand: 0.052755896
+  max_demand: 52.7559
 energy_production_wet_biomass:
-  max_demand: 0.160563183
+  max_demand: 160.56318
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad b/datasets/GM0928_kerkrade/GM0928_kerkrade.derived.ad
index cb6abb0bb7..9c6ba98c7c 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 = 126797
-- parent_id = 126797
+- id = 127246
+- parent_id = 127246
 - 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 b63538aec1..d80451fd1c 100644
--- a/datasets/GM0928_kerkrade/graph_values.yml
+++ b/datasets/GM0928_kerkrade/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.127466626
+  max_demand: 127.46663
 energy_production_oily_biomass:
-  max_demand: 0.027730383
+  max_demand: 27.73038
 energy_production_wet_biomass:
-  max_demand: 0.084247534
+  max_demand: 84.24753
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad b/datasets/GM0935_maastricht/GM0935_maastricht.derived.ad
index 30365dc46c..83f99b861a 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 = 126822
-- parent_id = 126822
+- id = 127271
+- parent_id = 127271
 - 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 8d6417fddd..d0ab245502 100644
--- a/datasets/GM0935_maastricht/graph_values.yml
+++ b/datasets/GM0935_maastricht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.327027215
+  max_demand: 327.02722
 energy_production_oily_biomass:
-  max_demand: 0.073858376
+  max_demand: 73.85838
 energy_production_wet_biomass:
-  max_demand: 0.237456162
+  max_demand: 237.45616
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad b/datasets/GM0938_meerssen/GM0938_meerssen.derived.ad
index 746d6d10bd..9d1a526fa0 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 = 126824
-- parent_id = 126824
+- id = 127273
+- parent_id = 127273
 - 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 80353d7944..d6a930463d 100644
--- a/datasets/GM0938_meerssen/graph_values.yml
+++ b/datasets/GM0938_meerssen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.057888067
+  max_demand: 57.88807
 energy_production_oily_biomass:
-  max_demand: 0.011496912
+  max_demand: 11.49691
 energy_production_wet_biomass:
-  max_demand: 0.053624922
+  max_demand: 53.62492
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 af2e495515..e065f3296b 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 = 126832
-- parent_id = 126832
+- id = 127281
+- parent_id = 127281
 - 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 8367dac137..b4a5d2f279 100644
--- a/datasets/GM0944_mook_en_middelaar/graph_values.yml
+++ b/datasets/GM0944_mook_en_middelaar/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.027256444
+  max_demand: 27.25644
 energy_production_oily_biomass:
-  max_demand: 0.004742636
+  max_demand: 4.74264
 energy_production_wet_biomass:
-  max_demand: 0.036985531
+  max_demand: 36.98553
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad b/datasets/GM0946_nederweert/GM0946_nederweert.derived.ad
index e5a2285b85..d86e029284 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 = 126834
-- parent_id = 126834
+- id = 127283
+- parent_id = 127283
 - 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 16114f7b22..75adfe61b9 100644
--- a/datasets/GM0946_nederweert/graph_values.yml
+++ b/datasets/GM0946_nederweert/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.291239203
+  max_demand: 291.2392
 energy_production_oily_biomass:
-  max_demand: 0.010329176
+  max_demand: 10.32918
 energy_production_wet_biomass:
-  max_demand: 0.355909417
+  max_demand: 355.90942
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0957_roermond/GM0957_roermond.derived.ad b/datasets/GM0957_roermond/GM0957_roermond.derived.ad
index 61906b7b75..c65a20ccf8 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 = 126882
-- parent_id = 126882
+- id = 127331
+- parent_id = 127331
 - 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 2572ce518a..65798c4751 100644
--- a/datasets/GM0957_roermond/graph_values.yml
+++ b/datasets/GM0957_roermond/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.171427169
+  max_demand: 171.42717
 energy_production_oily_biomass:
-  max_demand: 0.035365625
+  max_demand: 35.36563
 energy_production_wet_biomass:
-  max_demand: 0.210778091
+  max_demand: 210.77809
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad b/datasets/GM0965_simpelveld/GM0965_simpelveld.derived.ad
index 5fd32d4933..5fb208662f 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 = 126893
-- parent_id = 126893
+- id = 127342
+- parent_id = 127342
 - 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 2424b73c48..cef3d523f8 100644
--- a/datasets/GM0965_simpelveld/graph_values.yml
+++ b/datasets/GM0965_simpelveld/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.033821999
+  max_demand: 33.822
 energy_production_oily_biomass:
-  max_demand: 0.006389131
+  max_demand: 6.38913
 energy_production_wet_biomass:
-  max_demand: 0.041474817
+  max_demand: 41.47482
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0971_stein/GM0971_stein.derived.ad b/datasets/GM0971_stein/GM0971_stein.derived.ad
index e4d91ef09d..679db3822f 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 = 126907
-- parent_id = 126907
+- id = 127356
+- parent_id = 127356
 - 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 87c3ebbebc..27472dd132 100644
--- a/datasets/GM0971_stein/graph_values.yml
+++ b/datasets/GM0971_stein/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.07369621
+  max_demand: 73.69621
 energy_production_oily_biomass:
-  max_demand: 0.015165376
+  max_demand: 15.16538
 energy_production_wet_biomass:
-  max_demand: 0.065900396
+  max_demand: 65.9004
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0981_vaals/GM0981_vaals.derived.ad b/datasets/GM0981_vaals/GM0981_vaals.derived.ad
index 4163f6d575..b64d8fc96d 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 = 126926
-- parent_id = 126926
+- id = 127375
+- parent_id = 127375
 - 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 7ac3d8e25a..acca08576d 100644
--- a/datasets/GM0981_vaals/graph_values.yml
+++ b/datasets/GM0981_vaals/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.036263486
+  max_demand: 36.26349
 energy_production_oily_biomass:
-  max_demand: 0.006131524
+  max_demand: 6.13152
 energy_production_wet_biomass:
-  max_demand: 0.04009553
+  max_demand: 40.09553
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0983_venlo/GM0983_venlo.derived.ad b/datasets/GM0983_venlo/GM0983_venlo.derived.ad
index 3f95a2383d..11bb319e46 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 = 126934
-- parent_id = 126934
+- id = 127383
+- parent_id = 127383
 - 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 887290303b..30f0099449 100644
--- a/datasets/GM0983_venlo/graph_values.yml
+++ b/datasets/GM0983_venlo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.3123604
+  max_demand: 312.3604
 energy_production_oily_biomass:
-  max_demand: 0.061730207
+  max_demand: 61.73021
 energy_production_wet_biomass:
-  max_demand: 0.279802748
+  max_demand: 279.80275
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0984_venray/GM0984_venray.derived.ad b/datasets/GM0984_venray/GM0984_venray.derived.ad
index a14b511417..585450a253 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 = 126935
-- parent_id = 126935
+- id = 127384
+- parent_id = 127384
 - 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 ee3e01594c..878bad32a8 100644
--- a/datasets/GM0984_venray/graph_values.yml
+++ b/datasets/GM0984_venray/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.429712936
+  max_demand: 429.71294
 energy_production_oily_biomass:
-  max_demand: 0.026323268
+  max_demand: 26.32327
 energy_production_wet_biomass:
-  max_demand: 0.592959089
+  max_demand: 592.95909
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad b/datasets/GM0986_voerendaal/GM0986_voerendaal.derived.ad
index 5b079b8357..6d91c8f81f 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 = 126939
-- parent_id = 126939
+- id = 127388
+- parent_id = 127388
 - 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 9d856cbd37..53112ba523 100644
--- a/datasets/GM0986_voerendaal/graph_values.yml
+++ b/datasets/GM0986_voerendaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.044668047
+  max_demand: 44.66805
 energy_production_oily_biomass:
-  max_demand: 0.007565372
+  max_demand: 7.56537
 energy_production_wet_biomass:
-  max_demand: 0.061085542
+  max_demand: 61.08554
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0988_weert/GM0988_weert.derived.ad b/datasets/GM0988_weert/GM0988_weert.derived.ad
index d035fb45f0..64e67e649d 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 = 126949
-- parent_id = 126949
+- id = 127398
+- parent_id = 127398
 - 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 883a8747fe..38605f7da5 100644
--- a/datasets/GM0988_weert/graph_values.yml
+++ b/datasets/GM0988_weert/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.289103276
+  max_demand: 289.10328
 energy_production_oily_biomass:
-  max_demand: 0.030282147
+  max_demand: 30.28215
 energy_production_wet_biomass:
-  max_demand: 0.25418874
+  max_demand: 254.18874
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 af5fb5061c..f7cd4e993e 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 = 126927
-- parent_id = 126927
+- id = 127376
+- parent_id = 127376
 - 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 4475483448..f6a079056b 100644
--- a/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml
+++ b/datasets/GM0994_valkenburg_aan_de_geul/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.058214597
+  max_demand: 58.2146
 energy_production_oily_biomass:
-  max_demand: 0.01000656
+  max_demand: 10.00656
 energy_production_wet_biomass:
-  max_demand: 0.071673739
+  max_demand: 71.67374
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad b/datasets/GM0995_lelystad/GM0995_lelystad.derived.ad
index 88d93283a0..d77e552e5a 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 = 126810
-- parent_id = 126810
+- id = 127259
+- parent_id = 127259
 - 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 9d794399bf..e2eb711779 100644
--- a/datasets/GM0995_lelystad/graph_values.yml
+++ b/datasets/GM0995_lelystad/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.328689837
+  max_demand: 328.68984
 energy_production_oily_biomass:
-  max_demand: 0.047324892
+  max_demand: 47.32489
 energy_production_wet_biomass:
-  max_demand: 1.191203527
+  max_demand: 1191.20353
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 c79b9320a2..d556d48b2f 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 = 126788
-- parent_id = 126788
+- id = 127237
+- parent_id = 127237
 - 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 818f06bf69..ed86ca3f6b 100644
--- a/datasets/GM1507_horst_aan_de_maas/graph_values.yml
+++ b/datasets/GM1507_horst_aan_de_maas/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.250390729
+  max_demand: 250.39073
 energy_production_oily_biomass:
-  max_demand: 0.02569444
+  max_demand: 25.69444
 energy_production_wet_biomass:
-  max_demand: 0.44179165
+  max_demand: 441.79165
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad b/datasets/GM1509_oude_ijsselstreek/GM1509_oude_ijsselstreek.derived.ad
index e0608763a4..c21607e010 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 = 126861
-- parent_id = 126861
+- id = 127310
+- parent_id = 127310
 - 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 23e7c382e6..a93e82172a 100644
--- a/datasets/GM1509_oude_ijsselstreek/graph_values.yml
+++ b/datasets/GM1509_oude_ijsselstreek/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.159965001
+  max_demand: 159.965
 energy_production_oily_biomass:
-  max_demand: 0.023982328
+  max_demand: 23.98233
 energy_production_wet_biomass:
-  max_demand: 0.31358553
+  max_demand: 313.58553
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad b/datasets/GM1525_teylingen/GM1525_teylingen.derived.ad
index 7404654b22..44dcb3a022 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 = 126913
-- parent_id = 126913
+- id = 127362
+- parent_id = 127362
 - 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 ac6ff9ebf9..2c5e4e107d 100644
--- a/datasets/GM1525_teylingen/graph_values.yml
+++ b/datasets/GM1525_teylingen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.096413925
+  max_demand: 96.41393
 energy_production_oily_biomass:
-  max_demand: 0.022516886
+  max_demand: 22.51689
 energy_production_wet_biomass:
-  max_demand: 0.131915671
+  max_demand: 131.91567
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad b/datasets/GM1581_utrechtse_heuvelrug/GM1581_utrechtse_heuvelrug.derived.ad
index ffc58b99a5..39ceb826f2 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 = 126925
-- parent_id = 126925
+- id = 127374
+- parent_id = 127374
 - 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 99b12e8773..ab12fcdefd 100644
--- a/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml
+++ b/datasets/GM1581_utrechtse_heuvelrug/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.217775931
+  max_demand: 217.77593
 energy_production_oily_biomass:
-  max_demand: 0.030083474
+  max_demand: 30.08347
 energy_production_wet_biomass:
-  max_demand: 0.239002295
+  max_demand: 239.0023
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad b/datasets/GM1586_oost_gelre/GM1586_oost_gelre.derived.ad
index 37563ea218..0d470fa014 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 = 126854
-- parent_id = 126854
+- id = 127303
+- parent_id = 127303
 - 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 837d51490a..208a056751 100644
--- a/datasets/GM1586_oost_gelre/graph_values.yml
+++ b/datasets/GM1586_oost_gelre/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.175648117
+  max_demand: 175.64812
 energy_production_oily_biomass:
-  max_demand: 0.018047047
+  max_demand: 18.04705
 energy_production_wet_biomass:
-  max_demand: 0.33199944
+  max_demand: 331.99944
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad b/datasets/GM1598_koggenland/GM1598_koggenland.derived.ad
index af68911913..b3a90efa48 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 = 126798
-- parent_id = 126798
+- id = 127247
+- parent_id = 127247
 - 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 c4c50f10d2..6fe9dc74b3 100644
--- a/datasets/GM1598_koggenland/graph_values.yml
+++ b/datasets/GM1598_koggenland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.076284793
+  max_demand: 76.28479
 energy_production_oily_biomass:
-  max_demand: 0.013814764
+  max_demand: 13.81476
 energy_production_wet_biomass:
-  max_demand: 0.234312673
+  max_demand: 234.31267
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad b/datasets/GM1621_lansingerland/GM1621_lansingerland.derived.ad
index f6326ccb91..a55b5bf6d4 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 = 126804
-- parent_id = 126804
+- id = 127253
+- parent_id = 127253
 - 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 2642f8468d..410d3af7db 100644
--- a/datasets/GM1621_lansingerland/graph_values.yml
+++ b/datasets/GM1621_lansingerland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.16405134
+  max_demand: 164.05134
 energy_production_oily_biomass:
-  max_demand: 0.037426478
+  max_demand: 37.42648
 energy_production_wet_biomass:
-  max_demand: 0.157113565
+  max_demand: 157.11357
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1640_leudal/GM1640_leudal.derived.ad b/datasets/GM1640_leudal/GM1640_leudal.derived.ad
index c58da10c17..881410d35d 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 = 126811
-- parent_id = 126811
+- id = 127260
+- parent_id = 127260
 - 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 7bd62cf108..6a1d9762a4 100644
--- a/datasets/GM1640_leudal/graph_values.yml
+++ b/datasets/GM1640_leudal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.350586815
+  max_demand: 350.58682
 energy_production_oily_biomass:
-  max_demand: 0.02167845
+  max_demand: 21.67845
 energy_production_wet_biomass:
-  max_demand: 0.516290127
+  max_demand: 516.29013
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad b/datasets/GM1641_maasgouw/GM1641_maasgouw.derived.ad
index dfe2f42ce1..79aa54cb26 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 = 126820
-- parent_id = 126820
+- id = 127269
+- parent_id = 127269
 - 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 62ae8ef69a..63137cdc25 100644
--- a/datasets/GM1641_maasgouw/graph_values.yml
+++ b/datasets/GM1641_maasgouw/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.077318436
+  max_demand: 77.31844
 energy_production_oily_biomass:
-  max_demand: 0.01440896
+  max_demand: 14.40896
 energy_production_wet_biomass:
-  max_demand: 0.181618552
+  max_demand: 181.61855
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad b/datasets/GM1652_gemert_bakel/GM1652_gemert_bakel.derived.ad
index 55193828cc..2307b53e8f 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 = 126748
-- parent_id = 126748
+- id = 127197
+- parent_id = 127197
 - 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 42a717e11e..8ecff87adf 100644
--- a/datasets/GM1652_gemert_bakel/graph_values.yml
+++ b/datasets/GM1652_gemert_bakel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.202654158
+  max_demand: 202.65416
 energy_production_oily_biomass:
-  max_demand: 0.018498466
+  max_demand: 18.49847
 energy_production_wet_biomass:
-  max_demand: 0.407996982
+  max_demand: 407.99698
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad b/datasets/GM1655_halderberge/GM1655_halderberge.derived.ad
index f512f6dc3b..b0d140c0d9 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 = 126762
-- parent_id = 126762
+- id = 127211
+- parent_id = 127211
 - 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 8a1124d694..4c374a8ec5 100644
--- a/datasets/GM1655_halderberge/graph_values.yml
+++ b/datasets/GM1655_halderberge/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.104187797
+  max_demand: 104.1878
 energy_production_oily_biomass:
-  max_demand: 0.018344752
+  max_demand: 18.34475
 energy_production_wet_biomass:
-  max_demand: 0.247417519
+  max_demand: 247.41752
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad b/datasets/GM1658_heeze_leende/GM1658_heeze_leende.derived.ad
index 2f4b9c21e2..19c99da9b1 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 = 126773
-- parent_id = 126773
+- id = 127222
+- parent_id = 127222
 - 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 f618d09907..cc5846ae59 100644
--- a/datasets/GM1658_heeze_leende/graph_values.yml
+++ b/datasets/GM1658_heeze_leende/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.127966843
+  max_demand: 127.96684
 energy_production_oily_biomass:
-  max_demand: 0.009699133
+  max_demand: 9.69913
 energy_production_wet_biomass:
-  max_demand: 0.206425222
+  max_demand: 206.42522
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad b/datasets/GM1659_laarbeek/GM1659_laarbeek.derived.ad
index 278e7b0938..42106bd6e5 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 = 126801
-- parent_id = 126801
+- id = 127250
+- parent_id = 127250
 - 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 4e357d99f2..616fdd54fc 100644
--- a/datasets/GM1659_laarbeek/graph_values.yml
+++ b/datasets/GM1659_laarbeek/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.101942701
+  max_demand: 101.9427
 energy_production_oily_biomass:
-  max_demand: 0.013568701
+  max_demand: 13.5687
 energy_production_wet_biomass:
-  max_demand: 0.17067015
+  max_demand: 170.67015
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 8f2d9ea552..9d0a1532e8 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 = 126875
-- parent_id = 126875
+- id = 127324
+- parent_id = 127324
 - 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 62932b8c91..6f68d3f4c4 100644
--- a/datasets/GM1667_reusel_de_mierden/graph_values.yml
+++ b/datasets/GM1667_reusel_de_mierden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.103069909
+  max_demand: 103.06991
 energy_production_oily_biomass:
-  max_demand: 0.007934771
+  max_demand: 7.93477
 energy_production_wet_biomass:
-  max_demand: 0.358052818
+  max_demand: 358.05282
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad b/datasets/GM1669_roerdalen/GM1669_roerdalen.derived.ad
index 2267434920..70007494a1 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 = 126881
-- parent_id = 126881
+- id = 127330
+- parent_id = 127330
 - 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 a85ddf93f6..a1156411de 100644
--- a/datasets/GM1669_roerdalen/graph_values.yml
+++ b/datasets/GM1669_roerdalen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.098585043
+  max_demand: 98.58504
 energy_production_oily_biomass:
-  max_demand: 0.012524908
+  max_demand: 12.52491
 energy_production_wet_biomass:
-  max_demand: 0.158049274
+  max_demand: 158.04927
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad b/datasets/GM1674_roosendaal/GM1674_roosendaal.derived.ad
index 593594cf6e..32c0202001 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 = 126883
-- parent_id = 126883
+- id = 127332
+- parent_id = 127332
 - 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 7290d973a5..a3dc42dc0f 100644
--- a/datasets/GM1674_roosendaal/graph_values.yml
+++ b/datasets/GM1674_roosendaal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.241011952
+  max_demand: 241.01195
 energy_production_oily_biomass:
-  max_demand: 0.046801781
+  max_demand: 46.80178
 energy_production_wet_biomass:
-  max_demand: 0.332230341
+  max_demand: 332.23034
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad b/datasets/GM1676_schouwen_duiveland/GM1676_schouwen_duiveland.derived.ad
index a92ad1e541..8808c1c94b 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 = 126891
-- parent_id = 126891
+- id = 127340
+- parent_id = 127340
 - 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 abe09f9f06..940375c555 100644
--- a/datasets/GM1676_schouwen_duiveland/graph_values.yml
+++ b/datasets/GM1676_schouwen_duiveland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.164802215
+  max_demand: 164.80222
 energy_production_oily_biomass:
-  max_demand: 0.020522865
+  max_demand: 20.52287
 energy_production_wet_biomass:
-  max_demand: 0.670233507
+  max_demand: 670.23351
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 c3a07ece5b..a60f2b8202 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 = 126654
-- parent_id = 126654
+- id = 127103
+- parent_id = 127103
 - 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 1b30677d2d..51b734d25c 100644
--- a/datasets/GM1680_aa_en_hunze/graph_values.yml
+++ b/datasets/GM1680_aa_en_hunze/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.206608931
+  max_demand: 206.60893
 energy_production_oily_biomass:
-  max_demand: 0.01542359
+  max_demand: 15.42359
 energy_production_wet_biomass:
-  max_demand: 0.395372289
+  max_demand: 395.37229
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad b/datasets/GM1681_borger_odoorn/GM1681_borger_odoorn.derived.ad
index fcf8e4faf4..49eaaef661 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 = 126694
-- parent_id = 126694
+- id = 127143
+- parent_id = 127143
 - 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 b026e9f5bc..b8651b4522 100644
--- a/datasets/GM1681_borger_odoorn/graph_values.yml
+++ b/datasets/GM1681_borger_odoorn/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.266312203
+  max_demand: 266.3122
 energy_production_oily_biomass:
-  max_demand: 0.015415084
+  max_demand: 15.41508
 energy_production_wet_biomass:
-  max_demand: 0.38689829
+  max_demand: 386.89829
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad b/datasets/GM1690_de_wolden/GM1690_de_wolden.derived.ad
index 7579fad2df..0c2233795f 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 = 126715
-- parent_id = 126715
+- id = 127164
+- parent_id = 127164
 - 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 b94f9f679d..4d89488f69 100644
--- a/datasets/GM1690_de_wolden/graph_values.yml
+++ b/datasets/GM1690_de_wolden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.223271981
+  max_demand: 223.27198
 energy_production_oily_biomass:
-  max_demand: 0.01464834
+  max_demand: 14.64834
 energy_production_wet_biomass:
-  max_demand: 0.391070825
+  max_demand: 391.07083
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad b/datasets/GM1695_noord_beveland/GM1695_noord_beveland.derived.ad
index a77206a50d..89111ae3ec 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 = 126840
-- parent_id = 126840
+- id = 127289
+- parent_id = 127289
 - 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 e2f03cc526..4267b19218 100644
--- a/datasets/GM1695_noord_beveland/graph_values.yml
+++ b/datasets/GM1695_noord_beveland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.064005909
+  max_demand: 64.00591
 energy_production_oily_biomass:
-  max_demand: 0.004440069
+  max_demand: 4.44007
 energy_production_wet_biomass:
-  max_demand: 1.404088196
+  max_demand: 1404.0882
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad b/datasets/GM1696_wijdemeren/GM1696_wijdemeren.derived.ad
index 7f62ddcafa..3bcddd0fcf 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 = 126957
-- parent_id = 126957
+- id = 127406
+- parent_id = 127406
 - 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 389caef0d6..3c4834ae89 100644
--- a/datasets/GM1696_wijdemeren/graph_values.yml
+++ b/datasets/GM1696_wijdemeren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.075978441
+  max_demand: 75.97844
 energy_production_oily_biomass:
-  max_demand: 0.014589406
+  max_demand: 14.58941
 energy_production_wet_biomass:
-  max_demand: 0.367442974
+  max_demand: 367.44297
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad b/datasets/GM1699_noordenveld/GM1699_noordenveld.derived.ad
index 3af015cd2b..4b0dc774ba 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 = 126841
-- parent_id = 126841
+- id = 127290
+- parent_id = 127290
 - 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 a9b3866ee7..f6f4842d38 100644
--- a/datasets/GM1699_noordenveld/graph_values.yml
+++ b/datasets/GM1699_noordenveld/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.163510014
+  max_demand: 163.51001
 energy_production_oily_biomass:
-  max_demand: 0.019010641
+  max_demand: 19.01064
 energy_production_wet_biomass:
-  max_demand: 0.468821864
+  max_demand: 468.82186
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad b/datasets/GM1700_twenterand/GM1700_twenterand.derived.ad
index de5d8fe3c6..d950521724 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 = 126918
-- parent_id = 126918
+- id = 127367
+- parent_id = 127367
 - 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 f3ca44abff..3c016e54c9 100644
--- a/datasets/GM1700_twenterand/graph_values.yml
+++ b/datasets/GM1700_twenterand/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.147452932
+  max_demand: 147.45293
 energy_production_oily_biomass:
-  max_demand: 0.020530763
+  max_demand: 20.53076
 energy_production_wet_biomass:
-  max_demand: 0.264905191
+  max_demand: 264.90519
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad b/datasets/GM1701_westerveld/GM1701_westerveld.derived.ad
index 332b19b14f..4c832a05bc 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 = 126951
-- parent_id = 126951
+- id = 127400
+- parent_id = 127400
 - 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 f424b9cec1..2a00695653 100644
--- a/datasets/GM1701_westerveld/graph_values.yml
+++ b/datasets/GM1701_westerveld/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.165106902
+  max_demand: 165.1069
 energy_production_oily_biomass:
-  max_demand: 0.011755126
+  max_demand: 11.75513
 energy_production_wet_biomass:
-  max_demand: 0.459354184
+  max_demand: 459.35418
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad b/datasets/GM1705_lingewaard/GM1705_lingewaard.derived.ad
index b007cb8416..6753bd17fc 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 = 126813
-- parent_id = 126813
+- id = 127262
+- parent_id = 127262
 - 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 a1391e7ede..c24319bde2 100644
--- a/datasets/GM1705_lingewaard/graph_values.yml
+++ b/datasets/GM1705_lingewaard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.138203112
+  max_demand: 138.20311
 energy_production_oily_biomass:
-  max_demand: 0.028236483
+  max_demand: 28.23648
 energy_production_wet_biomass:
-  max_demand: 0.148302684
+  max_demand: 148.30268
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad b/datasets/GM1706_cranendonck/GM1706_cranendonck.derived.ad
index eddc63482b..11a9116413 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 = 126708
-- parent_id = 126708
+- id = 127157
+- parent_id = 127157
 - 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 97e4e11e72..e77dadf2d3 100644
--- a/datasets/GM1706_cranendonck/graph_values.yml
+++ b/datasets/GM1706_cranendonck/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.086123765
+  max_demand: 86.12377
 energy_production_oily_biomass:
-  max_demand: 0.012418584
+  max_demand: 12.41858
 energy_production_wet_biomass:
-  max_demand: 0.160828878
+  max_demand: 160.82888
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad b/datasets/GM1708_steenwijkerland/GM1708_steenwijkerland.derived.ad
index 97588c377d..910c128216 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 = 126906
-- parent_id = 126906
+- id = 127355
+- parent_id = 127355
 - 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 2caf3e4125..eb31b30bdd 100644
--- a/datasets/GM1708_steenwijkerland/graph_values.yml
+++ b/datasets/GM1708_steenwijkerland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.211286042
+  max_demand: 211.28604
 energy_production_oily_biomass:
-  max_demand: 0.026696311
+  max_demand: 26.69631
 energy_production_wet_biomass:
-  max_demand: 1.279919375
+  max_demand: 1279.91938
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad b/datasets/GM1709_moerdijk/GM1709_moerdijk.derived.ad
index 3559914b5c..ed46746c2f 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 = 126829
-- parent_id = 126829
+- id = 127278
+- parent_id = 127278
 - 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 a632d3c6f8..b35a3bf983 100644
--- a/datasets/GM1709_moerdijk/graph_values.yml
+++ b/datasets/GM1709_moerdijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.187392019
+  max_demand: 187.39202
 energy_production_oily_biomass:
-  max_demand: 0.02245613
+  max_demand: 22.45613
 energy_production_wet_biomass:
-  max_demand: 0.51641385
+  max_demand: 516.41385
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad b/datasets/GM1711_echt_susteren/GM1711_echt_susteren.derived.ad
index 25068e4d86..b5b7f7fd0e 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 = 126732
-- parent_id = 126732
+- id = 127181
+- parent_id = 127181
 - 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 bc03ba83c9..436443775b 100644
--- a/datasets/GM1711_echt_susteren/graph_values.yml
+++ b/datasets/GM1711_echt_susteren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.132409361
+  max_demand: 132.40936
 energy_production_oily_biomass:
-  max_demand: 0.019222073
+  max_demand: 19.22207
 energy_production_wet_biomass:
-  max_demand: 0.238136231
+  max_demand: 238.13623
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1714_sluis/GM1714_sluis.derived.ad b/datasets/GM1714_sluis/GM1714_sluis.derived.ad
index 8c58b8d121..744d161342 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 = 126897
-- parent_id = 126897
+- id = 127346
+- parent_id = 127346
 - 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 b188aa312e..767986de61 100644
--- a/datasets/GM1714_sluis/graph_values.yml
+++ b/datasets/GM1714_sluis/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.228281772
+  max_demand: 228.28177
 energy_production_oily_biomass:
-  max_demand: 0.014208465
+  max_demand: 14.20847
 energy_production_wet_biomass:
-  max_demand: 0.680747042
+  max_demand: 680.74704
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad b/datasets/GM1719_drimmelen/GM1719_drimmelen.derived.ad
index 9e369a8022..9497878b38 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 = 126728
-- parent_id = 126728
+- id = 127177
+- parent_id = 127177
 - 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 5a97995526..dd70173a6a 100644
--- a/datasets/GM1719_drimmelen/graph_values.yml
+++ b/datasets/GM1719_drimmelen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.115479998
+  max_demand: 115.48
 energy_production_oily_biomass:
-  max_demand: 0.016495331
+  max_demand: 16.49533
 energy_production_wet_biomass:
-  max_demand: 0.470123441
+  max_demand: 470.12344
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad b/datasets/GM1721_bernheze/GM1721_bernheze.derived.ad
index 4c5a27a608..ec92212dc4 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 = 126685
-- parent_id = 126685
+- id = 127134
+- parent_id = 127134
 - 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 aa2862ae1d..2ab857096e 100644
--- a/datasets/GM1721_bernheze/graph_values.yml
+++ b/datasets/GM1721_bernheze/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.240955903
+  max_demand: 240.9559
 energy_production_oily_biomass:
-  max_demand: 0.018716581
+  max_demand: 18.71658
 energy_production_wet_biomass:
-  max_demand: 0.324235659
+  max_demand: 324.23566
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad b/datasets/GM1723_alphen_chaam/GM1723_alphen_chaam.derived.ad
index 0ece7f9917..ed87f1be81 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 = 126664
-- parent_id = 126664
+- id = 127113
+- parent_id = 127113
 - 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 85f9a3c274..63ed30e9bf 100644
--- a/datasets/GM1723_alphen_chaam/graph_values.yml
+++ b/datasets/GM1723_alphen_chaam/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.10702505
+  max_demand: 107.02505
 energy_production_oily_biomass:
-  max_demand: 0.006166155
+  max_demand: 6.16616
 energy_production_wet_biomass:
-  max_demand: 0.204470469
+  max_demand: 204.47047
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad b/datasets/GM1724_bergeijk/GM1724_bergeijk.derived.ad
index 3f852e9de0..781d236f30 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 = 126680
-- parent_id = 126680
+- id = 127129
+- parent_id = 127129
 - 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 25ba0885d3..758e613ef3 100644
--- a/datasets/GM1724_bergeijk/graph_values.yml
+++ b/datasets/GM1724_bergeijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.147741336
+  max_demand: 147.74134
 energy_production_oily_biomass:
-  max_demand: 0.011234444
+  max_demand: 11.23444
 energy_production_wet_biomass:
-  max_demand: 0.239272727
+  max_demand: 239.27273
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1728_bladel/GM1728_bladel.derived.ad b/datasets/GM1728_bladel/GM1728_bladel.derived.ad
index 3dbd95a00f..7f13dadd4c 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 = 126689
-- parent_id = 126689
+- id = 127138
+- parent_id = 127138
 - 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 6af306c332..d3b9a5cf45 100644
--- a/datasets/GM1728_bladel/graph_values.yml
+++ b/datasets/GM1728_bladel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.123016639
+  max_demand: 123.01664
 energy_production_oily_biomass:
-  max_demand: 0.01225758
+  max_demand: 12.25758
 energy_production_wet_biomass:
-  max_demand: 0.209851136
+  max_demand: 209.85114
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad b/datasets/GM1729_gulpen_wittem/GM1729_gulpen_wittem.derived.ad
index 0bb5219da9..e62d46e881 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 = 126758
-- parent_id = 126758
+- id = 127207
+- parent_id = 127207
 - 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 733fcbb89f..6af751c817 100644
--- a/datasets/GM1729_gulpen_wittem/graph_values.yml
+++ b/datasets/GM1729_gulpen_wittem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.072989695
+  max_demand: 72.9897
 energy_production_oily_biomass:
-  max_demand: 0.00865534
+  max_demand: 8.65534
 energy_production_wet_biomass:
-  max_demand: 0.113684807
+  max_demand: 113.68481
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad b/datasets/GM1730_tynaarlo/GM1730_tynaarlo.derived.ad
index 895c1f2aee..72dfb74044 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 = 126919
-- parent_id = 126919
+- id = 127368
+- parent_id = 127368
 - 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 469180eb35..090cdad6ed 100644
--- a/datasets/GM1730_tynaarlo/graph_values.yml
+++ b/datasets/GM1730_tynaarlo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.136779111
+  max_demand: 136.77911
 energy_production_oily_biomass:
-  max_demand: 0.020473653
+  max_demand: 20.47365
 energy_production_wet_biomass:
-  max_demand: 0.295613491
+  max_demand: 295.61349
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad b/datasets/GM1731_midden_drenthe/GM1731_midden_drenthe.derived.ad
index ff9143909d..7e1cac6657 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 = 126828
-- parent_id = 126828
+- id = 127277
+- parent_id = 127277
 - 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 4f4db3574e..95c4be33c6 100644
--- a/datasets/GM1731_midden_drenthe/graph_values.yml
+++ b/datasets/GM1731_midden_drenthe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.355931902
+  max_demand: 355.9319
 energy_production_oily_biomass:
-  max_demand: 0.02015772
+  max_demand: 20.15772
 energy_production_wet_biomass:
-  max_demand: 0.652634108
+  max_demand: 652.63411
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad b/datasets/GM1734_overbetuwe/GM1734_overbetuwe.derived.ad
index b5b7a6cf86..df7bef5e8d 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 = 126864
-- parent_id = 126864
+- id = 127313
+- parent_id = 127313
 - 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 233073b49b..f819aadb9d 100644
--- a/datasets/GM1734_overbetuwe/graph_values.yml
+++ b/datasets/GM1734_overbetuwe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.193881535
+  max_demand: 193.88154
 energy_production_oily_biomass:
-  max_demand: 0.02888536
+  max_demand: 28.88536
 energy_production_wet_biomass:
-  max_demand: 0.243704066
+  max_demand: 243.70407
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 ac03c0297c..69e7940aa5 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 = 126784
-- parent_id = 126784
+- id = 127233
+- parent_id = 127233
 - 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 9830283851..b6f8327b1c 100644
--- a/datasets/GM1735_hof_van_twente/graph_values.yml
+++ b/datasets/GM1735_hof_van_twente/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.282012559
+  max_demand: 282.01256
 energy_production_oily_biomass:
-  max_demand: 0.021228246
+  max_demand: 21.22825
 energy_production_wet_biomass:
-  max_demand: 0.498841974
+  max_demand: 498.84197
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad b/datasets/GM1740_neder_betuwe/GM1740_neder_betuwe.derived.ad
index 910d5cffab..c1eb4e5391 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 = 126833
-- parent_id = 126833
+- id = 127282
+- parent_id = 127282
 - 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 6c641d2b3e..4df6117510 100644
--- a/datasets/GM1740_neder_betuwe/graph_values.yml
+++ b/datasets/GM1740_neder_betuwe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.165323904
+  max_demand: 165.3239
 energy_production_oily_biomass:
-  max_demand: 0.014602165
+  max_demand: 14.60217
 energy_production_wet_biomass:
-  max_demand: 0.116918232
+  max_demand: 116.91823
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad b/datasets/GM1742_rijssen_holten/GM1742_rijssen_holten.derived.ad
index 72266e0ba1..cb7b33bb9d 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 = 126879
-- parent_id = 126879
+- id = 127328
+- parent_id = 127328
 - 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 24793faef2..ba34c2321e 100644
--- a/datasets/GM1742_rijssen_holten/graph_values.yml
+++ b/datasets/GM1742_rijssen_holten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.149360977
+  max_demand: 149.36098
 energy_production_oily_biomass:
-  max_demand: 0.023269657
+  max_demand: 23.26966
 energy_production_wet_biomass:
-  max_demand: 0.223602878
+  max_demand: 223.60288
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad b/datasets/GM1771_geldrop_mierlo/GM1771_geldrop_mierlo.derived.ad
index 1514341732..21690619ad 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 = 126747
-- parent_id = 126747
+- id = 127196
+- parent_id = 127196
 - 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 ebc6aa19c4..544425f7a8 100644
--- a/datasets/GM1771_geldrop_mierlo/graph_values.yml
+++ b/datasets/GM1771_geldrop_mierlo/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.113275294
+  max_demand: 113.27529
 energy_production_oily_biomass:
-  max_demand: 0.024056451
+  max_demand: 24.05645
 energy_production_wet_biomass:
-  max_demand: 0.101357442
+  max_demand: 101.35744
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad b/datasets/GM1773_olst_wijhe/GM1773_olst_wijhe.derived.ad
index 6baa391ece..64158e00e2 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 = 126852
-- parent_id = 126852
+- id = 127301
+- parent_id = 127301
 - 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 a4f1c1664e..c7e04580b6 100644
--- a/datasets/GM1773_olst_wijhe/graph_values.yml
+++ b/datasets/GM1773_olst_wijhe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.096057699
+  max_demand: 96.0577
 energy_production_oily_biomass:
-  max_demand: 0.010979268
+  max_demand: 10.97927
 energy_production_wet_biomass:
-  max_demand: 0.275127501
+  max_demand: 275.1275
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad b/datasets/GM1774_dinkelland/GM1774_dinkelland.derived.ad
index 935538fe57..53b971d676 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 = 126722
-- parent_id = 126722
+- id = 127171
+- parent_id = 127171
 - 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 2c0dcaa04d..d764d2a498 100644
--- a/datasets/GM1774_dinkelland/graph_values.yml
+++ b/datasets/GM1774_dinkelland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.142745644
+  max_demand: 142.74564
 energy_production_oily_biomass:
-  max_demand: 0.016009281
+  max_demand: 16.00928
 energy_production_wet_biomass:
-  max_demand: 0.415177772
+  max_demand: 415.17777
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1783_westland/GM1783_westland.derived.ad b/datasets/GM1783_westland/GM1783_westland.derived.ad
index 61299d708e..61fa491bfd 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 = 126953
-- parent_id = 126953
+- id = 127402
+- parent_id = 127402
 - 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 153bf1f795..09717f278d 100644
--- a/datasets/GM1783_westland/graph_values.yml
+++ b/datasets/GM1783_westland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.278930071
+  max_demand: 278.93007
 energy_production_oily_biomass:
-  max_demand: 0.065983147
+  max_demand: 65.98315
 energy_production_wet_biomass:
-  max_demand: 0.223867763
+  max_demand: 223.86776
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad b/datasets/GM1842_midden_delfland/GM1842_midden_delfland.derived.ad
index 1a68ad131e..d752780ba1 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 = 126827
-- parent_id = 126827
+- id = 127276
+- parent_id = 127276
 - 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 77c413ba10..f66a47fdda 100644
--- a/datasets/GM1842_midden_delfland/graph_values.yml
+++ b/datasets/GM1842_midden_delfland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.059993136
+  max_demand: 59.99314
 energy_production_oily_biomass:
-  max_demand: 0.011781251
+  max_demand: 11.78125
 energy_production_wet_biomass:
-  max_demand: 0.132253529
+  max_demand: 132.25353
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad b/datasets/GM1859_berkelland/GM1859_berkelland.derived.ad
index 5b30222b5e..48d029383b 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 = 126684
-- parent_id = 126684
+- id = 127133
+- parent_id = 127133
 - 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 228ffd4408..8d7376df94 100644
--- a/datasets/GM1859_berkelland/graph_values.yml
+++ b/datasets/GM1859_berkelland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.235940505
+  max_demand: 235.94051
 energy_production_oily_biomass:
-  max_demand: 0.026674439
+  max_demand: 26.67444
 energy_production_wet_biomass:
-  max_demand: 0.650176884
+  max_demand: 650.17688
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad b/datasets/GM1876_bronckhorst/GM1876_bronckhorst.derived.ad
index 107d026f93..726a20c15a 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 = 126699
-- parent_id = 126699
+- id = 127148
+- parent_id = 127148
 - 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 08dd9d3d4e..210e34d5f3 100644
--- a/datasets/GM1876_bronckhorst/graph_values.yml
+++ b/datasets/GM1876_bronckhorst/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.230553987
+  max_demand: 230.55399
 energy_production_oily_biomass:
-  max_demand: 0.022001065
+  max_demand: 22.00107
 energy_production_wet_biomass:
-  max_demand: 0.613532199
+  max_demand: 613.5322
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad b/datasets/GM1883_sittard_geleen/GM1883_sittard_geleen.derived.ad
index e0b0290b62..7bb3cbd31e 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 = 126895
-- parent_id = 126895
+- id = 127344
+- parent_id = 127344
 - 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 92f2f48546..94ff10da09 100644
--- a/datasets/GM1883_sittard_geleen/graph_values.yml
+++ b/datasets/GM1883_sittard_geleen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.268137904
+  max_demand: 268.1379
 energy_production_oily_biomass:
-  max_demand: 0.05629738
+  max_demand: 56.29738
 energy_production_wet_biomass:
-  max_demand: 0.214720518
+  max_demand: 214.72052
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 cb805f2d65..1b6ce7496a 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 = 126793
-- parent_id = 126793
+- id = 127242
+- parent_id = 127242
 - 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 f46c864e49..5fec7475a3 100644
--- a/datasets/GM1884_kaag_en_braassem/graph_values.yml
+++ b/datasets/GM1884_kaag_en_braassem/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.085713416
+  max_demand: 85.71342
 energy_production_oily_biomass:
-  max_demand: 0.016322783
+  max_demand: 16.32278
 energy_production_wet_biomass:
-  max_demand: 0.253185934
+  max_demand: 253.18593
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad b/datasets/GM1891_dantumadiel/GM1891_dantumadiel.derived.ad
index c93510e48d..9798f8f1ed 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 = 126711
-- parent_id = 126711
+- id = 127160
+- parent_id = 127160
 - 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 0c2b2d8739..efad340659 100644
--- a/datasets/GM1891_dantumadiel/graph_values.yml
+++ b/datasets/GM1891_dantumadiel/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.069162572
+  max_demand: 69.16257
 energy_production_oily_biomass:
-  max_demand: 0.011496912
+  max_demand: 11.49691
 energy_production_wet_biomass:
-  max_demand: 0.215118017
+  max_demand: 215.11802
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad b/datasets/GM1892_zuidplas/GM1892_zuidplas.derived.ad
index 7d447c4760..90a2a8c2cb 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 = 126972
-- parent_id = 126972
+- id = 127421
+- parent_id = 127421
 - 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 d3d72070ce..5acd1d7d63 100644
--- a/datasets/GM1892_zuidplas/graph_values.yml
+++ b/datasets/GM1892_zuidplas/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.12412914
+  max_demand: 124.12914
 energy_production_oily_biomass:
-  max_demand: 0.025980602
+  max_demand: 25.9806
 energy_production_wet_biomass:
-  max_demand: 0.199402245
+  max_demand: 199.40225
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 584d138d26..5f94763bbb 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 = 126866
-- parent_id = 126866
+- id = 127315
+- parent_id = 127315
 - 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 df59a0731c..ae7b282735 100644
--- a/datasets/GM1894_peel_en_maas/graph_values.yml
+++ b/datasets/GM1894_peel_en_maas/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.278695818
+  max_demand: 278.69582
 energy_production_oily_biomass:
-  max_demand: 0.026314154
+  max_demand: 26.31415
 energy_production_wet_biomass:
-  max_demand: 0.373021129
+  max_demand: 373.02113
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad b/datasets/GM1895_oldambt/GM1895_oldambt.derived.ad
index 327d1b63fd..ddd1fc4659 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 = 126849
-- parent_id = 126849
+- id = 127298
+- parent_id = 127298
 - 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 9e6f5d0e8f..96844fa68d 100644
--- a/datasets/GM1895_oldambt/graph_values.yml
+++ b/datasets/GM1895_oldambt/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.284842762
+  max_demand: 284.84276
 energy_production_oily_biomass:
-  max_demand: 0.023165763
+  max_demand: 23.16576
 energy_production_wet_biomass:
-  max_demand: 0.565057867
+  max_demand: 565.05787
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad b/datasets/GM1896_zwartewaterland/GM1896_zwartewaterland.derived.ad
index 144ce15e2a..5b8778f226 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 = 126975
-- parent_id = 126975
+- id = 127424
+- parent_id = 127424
 - 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 f3c5836c6a..b3b9eacc5c 100644
--- a/datasets/GM1896_zwartewaterland/graph_values.yml
+++ b/datasets/GM1896_zwartewaterland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.079561889
+  max_demand: 79.56189
 energy_production_oily_biomass:
-  max_demand: 0.013671987
+  max_demand: 13.67199
 energy_production_wet_biomass:
-  max_demand: 0.250559944
+  max_demand: 250.55994
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad b/datasets/GM1900_sudwest_fryslan/GM1900_sudwest_fryslan.derived.ad
index cb7c1fab1e..f09bf94676 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 = 126909
-- parent_id = 126909
+- id = 127358
+- parent_id = 127358
 - 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 cb5f100bda..74bb06e0ec 100644
--- a/datasets/GM1900_sudwest_fryslan/graph_values.yml
+++ b/datasets/GM1900_sudwest_fryslan/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.447669617
+  max_demand: 447.66962
 energy_production_oily_biomass:
-  max_demand: 0.054504462
+  max_demand: 54.50446
 energy_production_wet_biomass:
-  max_demand: 1.771250971
+  max_demand: 1771.25097
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad b/datasets/GM1901_bodegraven_reeuwijk/GM1901_bodegraven_reeuwijk.derived.ad
index 09c60d45bc..89764fa530 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 = 126692
-- parent_id = 126692
+- id = 127141
+- parent_id = 127141
 - 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 a4ba7f38f3..269594e0c7 100644
--- a/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml
+++ b/datasets/GM1901_bodegraven_reeuwijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.109451535
+  max_demand: 109.45154
 energy_production_oily_biomass:
-  max_demand: 0.020937831
+  max_demand: 20.93783
 energy_production_wet_biomass:
-  max_demand: 0.316181057
+  max_demand: 316.18106
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad b/datasets/GM1903_eijsden_margraten/GM1903_eijsden_margraten.derived.ad
index ab151c4516..3c2fb7a637 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 = 126737
-- parent_id = 126737
+- id = 127186
+- parent_id = 127186
 - 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 6d03d912c8..e04bf3aa3c 100644
--- a/datasets/GM1903_eijsden_margraten/graph_values.yml
+++ b/datasets/GM1903_eijsden_margraten/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.095060104
+  max_demand: 95.0601
 energy_production_oily_biomass:
-  max_demand: 0.015588847
+  max_demand: 15.58885
 energy_production_wet_biomass:
-  max_demand: 0.153981324
+  max_demand: 153.98132
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad b/datasets/GM1904_stichtse_vecht/GM1904_stichtse_vecht.derived.ad
index 0d207267b4..4cc5bd0a59 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 = 126908
-- parent_id = 126908
+- id = 127357
+- parent_id = 127357
 - 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 a9c3aac62e..fe9ad8cb1e 100644
--- a/datasets/GM1904_stichtse_vecht/graph_values.yml
+++ b/datasets/GM1904_stichtse_vecht/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.192265409
+  max_demand: 192.26541
 energy_production_oily_biomass:
-  max_demand: 0.039088163
+  max_demand: 39.08816
 energy_production_wet_biomass:
-  max_demand: 0.355340116
+  max_demand: 355.34012
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad b/datasets/GM1911_hollands_kroon/GM1911_hollands_kroon.derived.ad
index 3743ad05fd..860d7b1947 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 = 126785
-- parent_id = 126785
+- id = 127234
+- parent_id = 127234
 - 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 60933c191a..385f860d05 100644
--- a/datasets/GM1911_hollands_kroon/graph_values.yml
+++ b/datasets/GM1911_hollands_kroon/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.285741948
+  max_demand: 285.74195
 energy_production_oily_biomass:
-  max_demand: 0.029050617
+  max_demand: 29.05062
 energy_production_wet_biomass:
-  max_demand: 0.964574202
+  max_demand: 964.5742
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad b/datasets/GM1916_leidschendam_voorburg/GM1916_leidschendam_voorburg.derived.ad
index 0c7f70bf89..a1b7c72650 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 = 126809
-- parent_id = 126809
+- id = 127258
+- parent_id = 127258
 - 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 6f16c03db4..ce33607869 100644
--- a/datasets/GM1916_leidschendam_voorburg/graph_values.yml
+++ b/datasets/GM1916_leidschendam_voorburg/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.19601137
+  max_demand: 196.01137
 energy_production_oily_biomass:
-  max_demand: 0.045825427
+  max_demand: 45.82543
 energy_production_wet_biomass:
-  max_demand: 0.176877754
+  max_demand: 176.87775
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad b/datasets/GM1924_goeree_overflakkee/GM1924_goeree_overflakkee.derived.ad
index 0f71a81584..7483093596 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 = 126751
-- parent_id = 126751
+- id = 127200
+- parent_id = 127200
 - 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 602cf86225..7e2227ea39 100644
--- a/datasets/GM1924_goeree_overflakkee/graph_values.yml
+++ b/datasets/GM1924_goeree_overflakkee/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.210230754
+  max_demand: 210.23075
 energy_production_oily_biomass:
-  max_demand: 0.0301418
+  max_demand: 30.1418
 energy_production_wet_biomass:
-  max_demand: 0.883777953
+  max_demand: 883.77795
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad b/datasets/GM1926_pijnacker_nootdorp/GM1926_pijnacker_nootdorp.derived.ad
index 39cd034902..13f353ace1 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 = 126868
-- parent_id = 126868
+- id = 127317
+- parent_id = 127317
 - 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 8c657c95c5..635502aa80 100644
--- a/datasets/GM1926_pijnacker_nootdorp/graph_values.yml
+++ b/datasets/GM1926_pijnacker_nootdorp/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.14187312
+  max_demand: 141.87312
 energy_production_oily_biomass:
-  max_demand: 0.033009497
+  max_demand: 33.0095
 energy_production_wet_biomass:
-  max_demand: 0.124054338
+  max_demand: 124.05434
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad b/datasets/GM1930_nissewaard/GM1930_nissewaard.derived.ad
index bc8ac70a0f..6396888bb8 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 = 126839
-- parent_id = 126839
+- id = 127288
+- parent_id = 127288
 - 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 86f4581c6a..3e662ecee5 100644
--- a/datasets/GM1930_nissewaard/graph_values.yml
+++ b/datasets/GM1930_nissewaard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.249902774
+  max_demand: 249.90277
 energy_production_oily_biomass:
-  max_demand: 0.051519506
+  max_demand: 51.51951
 energy_production_wet_biomass:
-  max_demand: 0.29612688
+  max_demand: 296.12688
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad b/datasets/GM1931_krimpenerwaard/GM1931_krimpenerwaard.derived.ad
index 04e558f859..125fdbec8d 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 = 126800
-- parent_id = 126800
+- id = 127249
+- parent_id = 127249
 - 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 58162a4ed7..28fb945c18 100644
--- a/datasets/GM1931_krimpenerwaard/graph_values.yml
+++ b/datasets/GM1931_krimpenerwaard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.182095895
+  max_demand: 182.0959
 energy_production_oily_biomass:
-  max_demand: 0.034052682
+  max_demand: 34.05268
 energy_production_wet_biomass:
-  max_demand: 0.416144936
+  max_demand: 416.14494
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 8bc8759645..974fcad3c2 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 = 126713
-- parent_id = 126713
+- id = 127162
+- parent_id = 127162
 - 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 82e198bca3..e4c9b9300f 100644
--- a/datasets/GM1940_de_fryske_marren/graph_values.yml
+++ b/datasets/GM1940_de_fryske_marren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.259569015
+  max_demand: 259.56902
 energy_production_oily_biomass:
-  max_demand: 0.031246957
+  max_demand: 31.24696
 energy_production_wet_biomass:
-  max_demand: 1.496436485
+  max_demand: 1496.43649
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad b/datasets/GM1942_gooise_meren/GM1942_gooise_meren.derived.ad
index e5364f801c..13c9e62e28 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 = 126754
-- parent_id = 126754
+- id = 127203
+- parent_id = 127203
 - 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 5fcb9bb631..17b44c192f 100644
--- a/datasets/GM1942_gooise_meren/graph_values.yml
+++ b/datasets/GM1942_gooise_meren/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.158361678
+  max_demand: 158.36168
 energy_production_oily_biomass:
-  max_demand: 0.035065489
+  max_demand: 35.06549
 energy_production_wet_biomass:
-  max_demand: 0.181605819
+  max_demand: 181.60582
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 6765184a7a..b853a081ca 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 = 126679
-- parent_id = 126679
+- id = 127128
+- parent_id = 127128
 - 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 9e0f2fd5a7..08ac04451a 100644
--- a/datasets/GM1945_berg_en_dal/graph_values.yml
+++ b/datasets/GM1945_berg_en_dal/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.128199817
+  max_demand: 128.19982
 energy_production_oily_biomass:
-  max_demand: 0.021126783
+  max_demand: 21.12678
 energy_production_wet_biomass:
-  max_demand: 0.216687981
+  max_demand: 216.68798
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad b/datasets/GM1948_meierijstad/GM1948_meierijstad.derived.ad
index cb323e6dea..945092f3f8 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 = 126978
-- parent_id = 126978
+- id = 127427
+- parent_id = 127427
 - 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 771ce528aa..9aa572ad52 100644
--- a/datasets/GM1948_meierijstad/graph_values.yml
+++ b/datasets/GM1948_meierijstad/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.349995867
+  max_demand: 349.99587
 energy_production_oily_biomass:
-  max_demand: 0.049100191
+  max_demand: 49.10019
 energy_production_wet_biomass:
-  max_demand: 0.605743571
+  max_demand: 605.74357
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad b/datasets/GM1949_waadhoeke/GM1949_waadhoeke.derived.ad
index dbffe43a2f..4fd1e26f9b 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 = 126979
-- parent_id = 126979
+- id = 127428
+- parent_id = 127428
 - 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 243dba965d..64bafb5f1e 100644
--- a/datasets/GM1949_waadhoeke/graph_values.yml
+++ b/datasets/GM1949_waadhoeke/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.297721114
+  max_demand: 297.72111
 energy_production_oily_biomass:
-  max_demand: 0.027971586
+  max_demand: 27.97159
 energy_production_wet_biomass:
-  max_demand: 0.729659894
+  max_demand: 729.65989
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad b/datasets/GM1950_westerwolde/GM1950_westerwolde.derived.ad
index 1dd034c38a..bdc917f6ce 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 = 126980
-- parent_id = 126980
+- id = 127429
+- parent_id = 127429
 - 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 f578a3695f..a6b3d57baf 100644
--- a/datasets/GM1950_westerwolde/graph_values.yml
+++ b/datasets/GM1950_westerwolde/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.212092559
+  max_demand: 212.09256
 energy_production_oily_biomass:
-  max_demand: 0.015309976
+  max_demand: 15.30998
 energy_production_wet_biomass:
-  max_demand: 0.439986612
+  max_demand: 439.98661
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad b/datasets/GM1952_midden_groningen/GM1952_midden_groningen.derived.ad
index 6667071abe..db1e24f0a1 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 = 126981
-- parent_id = 126981
+- id = 127430
+- parent_id = 127430
 - 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 564d30a5e3..21d18b2c8c 100644
--- a/datasets/GM1952_midden_groningen/graph_values.yml
+++ b/datasets/GM1952_midden_groningen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.333369601
+  max_demand: 333.3696
 energy_production_oily_biomass:
-  max_demand: 0.036999969
+  max_demand: 36.99997
 energy_production_wet_biomass:
-  max_demand: 0.67549708
+  max_demand: 675.49708
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad b/datasets/GM1954_beekdaelen/GM1954_beekdaelen.derived.ad
index 051a45423e..24a39d04c5 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 = 126998
-- parent_id = 126998
+- id = 127435
+- parent_id = 127435
 - 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 13c7367ca1..32af555da1 100644
--- a/datasets/GM1954_beekdaelen/graph_values.yml
+++ b/datasets/GM1954_beekdaelen/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.123766429
+  max_demand: 123.76643
 energy_production_oily_biomass:
-  max_demand: 0.021706398
+  max_demand: 21.7064
 energy_production_wet_biomass:
-  max_demand: 0.128334669
+  max_demand: 128.33467
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1955_montferland/GM1955_montferland.derived.ad b/datasets/GM1955_montferland/GM1955_montferland.derived.ad
index 28e1048138..52052e1ba0 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 = 126830
-- parent_id = 126830
+- id = 127279
+- parent_id = 127279
 - 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 b3b14a41d3..c1305cfae5 100644
--- a/datasets/GM1955_montferland/graph_values.yml
+++ b/datasets/GM1955_montferland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.150127947
+  max_demand: 150.12795
 energy_production_oily_biomass:
-  max_demand: 0.021888059
+  max_demand: 21.88806
 energy_production_wet_biomass:
-  max_demand: 0.226741259
+  max_demand: 226.74126
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1959_altena/GM1959_altena.derived.ad b/datasets/GM1959_altena/GM1959_altena.derived.ad
index 11086eed82..1239c3e3d8 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 = 126997
-- parent_id = 126997
+- id = 127434
+- parent_id = 127434
 - 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 aacb5c3ac5..df4519ebf9 100644
--- a/datasets/GM1959_altena/graph_values.yml
+++ b/datasets/GM1959_altena/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.232172565
+  max_demand: 232.17257
 energy_production_oily_biomass:
-  max_demand: 0.033650475
+  max_demand: 33.65048
 energy_production_wet_biomass:
-  max_demand: 0.643295204
+  max_demand: 643.2952
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad b/datasets/GM1960_west_betuwe/GM1960_west_betuwe.derived.ad
index 2df4dec6d9..00954d79e5 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 = 126995
-- parent_id = 126995
+- id = 127432
+- parent_id = 127432
 - 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 01735e9c53..79308a66bb 100644
--- a/datasets/GM1960_west_betuwe/graph_values.yml
+++ b/datasets/GM1960_west_betuwe/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.199202195
+  max_demand: 199.2022
 energy_production_oily_biomass:
-  max_demand: 0.030801613
+  max_demand: 30.80161
 energy_production_wet_biomass:
-  max_demand: 0.436357906
+  max_demand: 436.35791
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad b/datasets/GM1961_vijfheerenlanden/GM1961_vijfheerenlanden.derived.ad
index febf92594a..386100755f 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 = 126983
-- parent_id = 126983
+- id = 127431
+- parent_id = 127431
 - 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 ef05d026a3..04a1fb96ee 100644
--- a/datasets/GM1961_vijfheerenlanden/graph_values.yml
+++ b/datasets/GM1961_vijfheerenlanden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.190557288
+  max_demand: 190.55729
 energy_production_oily_biomass:
-  max_demand: 0.033848541
+  max_demand: 33.84854
 energy_production_wet_biomass:
-  max_demand: 0.348657846
+  max_demand: 348.65785
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad b/datasets/GM1963_hoeksche_waard/GM1963_hoeksche_waard.derived.ad
index d62499bfa4..2f54637be2 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 = 126999
-- parent_id = 126999
+- id = 127436
+- parent_id = 127436
 - 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 4a449e3df5..7ca1042e5a 100644
--- a/datasets/GM1963_hoeksche_waard/graph_values.yml
+++ b/datasets/GM1963_hoeksche_waard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.335280938
+  max_demand: 335.28094
 energy_production_oily_biomass:
-  max_demand: 0.052648965
+  max_demand: 52.64897
 energy_production_wet_biomass:
-  max_demand: 0.882084864
+  max_demand: 882.08486
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad b/datasets/GM1966_het_hogeland/GM1966_het_hogeland.derived.ad
index be916483fe..e2a9625a98 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 = 126996
-- parent_id = 126996
+- id = 127433
+- parent_id = 127433
 - 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 45ba4eb115..51ccf3669e 100644
--- a/datasets/GM1966_het_hogeland/graph_values.yml
+++ b/datasets/GM1966_het_hogeland/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.392528427
+  max_demand: 392.52843
 energy_production_oily_biomass:
-  max_demand: 0.030041552
+  max_demand: 30.04155
 energy_production_wet_biomass:
-  max_demand: 5.991852324
+  max_demand: 5991.85232
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad b/datasets/GM1969_westerkwartier/GM1969_westerkwartier.derived.ad
index e6bcf4bfd7..adc2138557 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 = 127002
-- parent_id = 127002
+- id = 127439
+- parent_id = 127439
 - 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 8cc3ccba5e..76d16eda85 100644
--- a/datasets/GM1969_westerkwartier/graph_values.yml
+++ b/datasets/GM1969_westerkwartier/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.317604498
+  max_demand: 317.6045
 energy_production_oily_biomass:
-  max_demand: 0.03734871
+  max_demand: 37.34871
 energy_production_wet_biomass:
-  max_demand: 0.708802309
+  max_demand: 708.80231
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad b/datasets/GM1970_noardeast_fryslan/GM1970_noardeast_fryslan.derived.ad
index 2fba3d49ac..92c568e938 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 = 127001
-- parent_id = 127001
+- id = 127438
+- parent_id = 127438
 - 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 43766e89c6..527690cf2a 100644
--- a/datasets/GM1970_noardeast_fryslan/graph_values.yml
+++ b/datasets/GM1970_noardeast_fryslan/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.295119981
+  max_demand: 295.11998
 energy_production_oily_biomass:
-  max_demand: 0.027450297
+  max_demand: 27.4503
 energy_production_wet_biomass:
-  max_demand: 1.152551021
+  max_demand: 1152.55102
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad b/datasets/GM1978_molenlanden/GM1978_molenlanden.derived.ad
index 5470f65393..764acd0d30 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 = 127000
-- parent_id = 127000
+- id = 127437
+- parent_id = 127437
 - 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 012d2565de..7cadc6d84a 100644
--- a/datasets/GM1978_molenlanden/graph_values.yml
+++ b/datasets/GM1978_molenlanden/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.168758711
+  max_demand: 168.75871
 energy_production_oily_biomass:
-  max_demand: 0.026646491
+  max_demand: 26.64649
 energy_production_wet_biomass:
-  max_demand: 0.51389615
+  max_demand: 513.89615
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad b/datasets/GM1979_eemsdelta/GM1979_eemsdelta.derived.ad
index 47d15d9447..ac367a2494 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 = 127003
-- parent_id = 127003
+- id = 127440
+- parent_id = 127440
 - 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 11afd409a7..8860ffe05c 100644
--- a/datasets/GM1979_eemsdelta/graph_values.yml
+++ b/datasets/GM1979_eemsdelta/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.358628798
+  max_demand: 358.6288
 energy_production_oily_biomass:
-  max_demand: 0.027978876
+  max_demand: 27.97888
 energy_production_wet_biomass:
-  max_demand: 0.63648366
+  max_demand: 636.48366
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 6ed0f850b4..eff7126f3e 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 = 127005
-- parent_id = 127005
+- id = 127441
+- parent_id = 127441
 - 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 528f4570bb..1ea0a18125 100644
--- a/datasets/GM1980_dijk_en_waard/graph_values.yml
+++ b/datasets/GM1980_dijk_en_waard/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.074479586
+  max_demand: 74.47959
 energy_production_oily_biomass:
-  max_demand: 0.017006899
+  max_demand: 17.0069
 energy_production_wet_biomass:
-  max_demand: 0.101565377
+  max_demand: 101.56538
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 d41deaca46..60946652f6 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 = 127006
-- parent_id = 127006
+- id = 127442
+- parent_id = 127442
 - 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 21e275e7a4..dbae6b3583 100644
--- a/datasets/GM1982_land_van_cuijk/graph_values.yml
+++ b/datasets/GM1982_land_van_cuijk/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.107650119
+  max_demand: 107.65012
 energy_production_oily_biomass:
-  max_demand: 0.007051374
+  max_demand: 7.05137
 energy_production_wet_biomass:
-  max_demand: 0.430550136
+  max_demand: 430.55014
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
diff --git a/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad b/datasets/GM1991_maashorst/GM1991_maashorst.derived.ad
index 30a61df953..264ccadc2e 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 = 127007
-- parent_id = 127007
+- id = 127443
+- parent_id = 127443
 - 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 595fb02bd4..4ee6554edd 100644
--- a/datasets/GM1991_maashorst/graph_values.yml
+++ b/datasets/GM1991_maashorst/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.168001126
+  max_demand: 168.00113
 energy_production_oily_biomass:
-  max_demand: 0.02538519
+  max_demand: 25.38519
 energy_production_wet_biomass:
-  max_demand: 0.21841862
+  max_demand: 218.41862
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:
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 1836d6eccd..2fedce4190 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 = 127008
-- parent_id = 127008
+- id = 127444
+- parent_id = 127444
 - 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 4cee1fc2db..b14d86f7cb 100644
--- a/datasets/GM1992_voorne_aan_zee/graph_values.yml
+++ b/datasets/GM1992_voorne_aan_zee/graph_values.yml
@@ -522,11 +522,11 @@ energy_power_wind_turbine_offshore:
   demand: 0.0
   full_load_hours: 3397.0
 energy_production_dry_biomass:
-  max_demand: 0.142505264
+  max_demand: 142.50526
 energy_production_oily_biomass:
-  max_demand: 0.019873988
+  max_demand: 19.87399
 energy_production_wet_biomass:
-  max_demand: 0.261651654
+  max_demand: 261.65165
 households_final_demand_bio_kerosene:
   demand: 0.0
 households_final_demand_biodiesel:

From 5236df33ee3a64c98daacb66eb71e4f0061f7f58 Mon Sep 17 00:00:00 2001
From: Max <max.kerpel@quintel.com>
Date: Thu, 6 Nov 2025 10:40:07 +0100
Subject: [PATCH 7/7] 'bug fix decimal point industry steel'

---
 datasets/GM0794_helmond/graph_values.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datasets/GM0794_helmond/graph_values.yml b/datasets/GM0794_helmond/graph_values.yml
index 318b882db6..98157abbf1 100644
--- a/datasets/GM0794_helmond/graph_values.yml
+++ b/datasets/GM0794_helmond/graph_values.yml
@@ -1141,7 +1141,7 @@ industry_final_demand_for_metal_electricity-industry_final_demand_for_metal_stee
 industry_final_demand_for_metal_network_gas-industry_final_demand_for_metal_aluminium_network_gas@network_gas:
   parent_share: 0.3965722034477919
 industry_final_demand_for_metal_network_gas-industry_final_demand_for_metal_steel_network_gas@network_gas:
-  parent_share: 0.603427796552208
+  parent_share: 0.6034277965522081
 industry_final_demand_for_metal_steam_hot_water-industry_final_demand_for_metal_steel_steam_hot_water@steam_hot_water:
   parent_share: 1.0
 industry_final_demand_for_metal_steel_coal-industry_steel_blastfurnace_bof@coal: