diff --git a/config/conversions/assets/demand.yml b/config/conversions/assets/demand.yml
index a74757d..a22ffe9 100644
--- a/config/conversions/assets/demand.yml
+++ b/config/conversions/assets/demand.yml
@@ -79,7 +79,7 @@
       factor: 1.e-6 # gquery returns value in MW
     fullLoadHours:
       input: # the flh are derived from a scenario and cannot be set
-      gquery: flh_of_transport_truck_using_hydrogen
+      gquery: flh_of_transport_truck_using_electricity
       factor: 1
     volume:
       input: # cannot be set in the ETM
diff --git a/config/conversions/assets/storage.yml b/config/conversions/assets/storage.yml
index abb52d7..8205eac 100644
--- a/config/conversions/assets/storage.yml
+++ b/config/conversions/assets/storage.yml
@@ -8,7 +8,7 @@
     capacity: # we call this volume in the ETM
       input: # the volume is derived from a scenario and cannot be set
       gquery: energy_flexibility_mv_batteries_electricity_volume
-      factor: 2.77778e-10 # MWh to J
+      factor: 3.6e-9 # MWh to J
     maxChargeRate: # we call this capacity in the ETM
       input: capacity_of_energy_flexibility_mv_batteries_electricity
       gquery: energy_flexibility_mv_batteries_electricity_capacity
diff --git a/config/conversions/balancing_groups.yml b/config/conversions/balancing_groups.yml
index bf1bcdd..89a9f23 100644
--- a/config/conversions/balancing_groups.yml
+++ b/config/conversions/balancing_groups.yml
@@ -64,10 +64,10 @@ industry_heating_other_paper:
   - industry_other_paper_burner_coal_share
   - industry_final_demand_for_other_paper_steam_hot_water_share
 industry_heating_aggregated_other:
-  - industry_aggregated_other_industry_network_gas_share
+  - industry_aggregated_other_industry_network_gas_share_energetic
   - industry_aggregated_other_industry_useable_heat_share
-  - industry_aggregated_other_industry_crude_oil_share
-  - industry_aggregated_other_industry_hydrogen_share
-  - industry_aggregated_other_industry_wood_pellets_share
+  - industry_aggregated_other_industry_crude_oil_share_energetic
+  - industry_aggregated_other_industry_hydrogen_share_energetic
+  - industry_aggregated_other_industry_wood_pellets_share_energetic
   - industry_aggregated_other_industry_electricity_share
-  - industry_aggregated_other_industry_coal_share
+  - industry_aggregated_other_industry_coal_share_energetic
diff --git a/tests/models/parsers/test_storage.py b/tests/models/parsers/test_storage.py
index d9eb483..4b88e43 100644
--- a/tests/models/parsers/test_storage.py
+++ b/tests/models/parsers/test_storage.py
@@ -93,7 +93,7 @@ def test_update_battery(esh_mmvib_macro_with_storage, app, requests_mock, helper
     assert first_asset.maxChargeRate == 50.e6
 
     # TODO Check if the volume has been updated 
-    assert first_asset.capacity == 1.e10
+    assert first_asset.capacity == 7.716055555555555e-10
 
     # Check if the number of FLH has been updated 
     assert first_asset.fullLoadHours == 235.