diff --git a/rules/retrieve.smk b/rules/retrieve.smk
index d7e22e71..5af0ffb5 100644
--- a/rules/retrieve.smk
+++ b/rules/retrieve.smk
@@ -156,6 +156,8 @@ if config["enable"]["retrieve"] and (
 if config["enable"]["retrieve"]:
 
     rule retrieve_electricity_demand:
+        params:
+            versions=["2019-06-05", "2020-10-06"],
         output:
             "data/load_raw.csv",
         log:
diff --git a/scripts/build_industrial_distribution_key.py b/scripts/build_industrial_distribution_key.py
index 979a1493..24cb6fa0 100644
--- a/scripts/build_industrial_distribution_key.py
+++ b/scripts/build_industrial_distribution_key.py
@@ -116,7 +116,7 @@ def build_nodal_distribution_key(hotmaps, regions, countries):
 
         if not facilities.empty:
             emissions = facilities["Emissions_ETS_2014"].fillna(
-                hotmaps["Emissions_EPRTR_2014"]
+                hotmaps["Emissions_EPRTR_2014"].dropna()
             )
             if emissions.sum() == 0:
                 key = pd.Series(1 / len(facilities), facilities.index)
@@ -140,7 +140,7 @@ if __name__ == "__main__":
         snakemake = mock_snakemake(
             "build_industrial_distribution_key",
             simpl="",
-            clusters=48,
+            clusters=128,
         )
 
     logging.basicConfig(level=snakemake.config["logging"]["level"])
diff --git a/scripts/retrieve_electricity_demand.py b/scripts/retrieve_electricity_demand.py
index 58615755..58511857 100644
--- a/scripts/retrieve_electricity_demand.py
+++ b/scripts/retrieve_electricity_demand.py
@@ -27,11 +27,11 @@ if __name__ == "__main__":
     configure_logging(snakemake)
     set_scenario_config(snakemake)
 
-    versions = ["2019-06-05", "2020-10-06"]
     url = "https://data.open-power-system-data.org/time_series/{version}/time_series_60min_singleindex.csv"
 
     df1, df2 = [
-        pd.read_csv(url.format(version=version), index_col=0) for version in versions
+        pd.read_csv(url.format(version=version), index_col=0)
+        for version in snakemake.params.versions
     ]
     res = pd.concat([df1, df2[df2.index > df1.index[-1]]], join="inner")
     res.to_csv(snakemake.output[0])