diff --git a/bin/load_performance.py b/bin/load_performance.py
index ce37799..4c38af0 100755
--- a/bin/load_performance.py
+++ b/bin/load_performance.py
@@ -155,7 +155,8 @@ def create_performance_tables(merged_data, cf_merged_data, endpoint_summary_data
         active_endpoint_count=pd.NamedAgg(
             column='endpoint',
             aggfunc=lambda x: x[(merged_data.loc[x.index,
-                                                'endpoint_end_date'].notna())].nunique()
+                                                'endpoint_end_date'].isna() |
+                                                  (merged_data['endpoint_end_date'] == ""))].nunique()
         ),
         error_endpoint_count=pd.NamedAgg(
             column='endpoint',
diff --git a/bin/load_reporting_tables.py b/bin/load_reporting_tables.py
index f8a7241..17a5937 100755
--- a/bin/load_reporting_tables.py
+++ b/bin/load_reporting_tables.py
@@ -21,7 +21,7 @@ def fetch_historic_endpoints_data_from_dl(db_path):
         s.organisation,
         o.name,
         o.name as organisation_name,
-        o.dataset,
+        sp.pipeline as dataset,
         s.collection,
         sp.pipeline,
         l.endpoint,
@@ -66,7 +66,7 @@ def fetch_latest_endpoints_data_from_dl(db_path):
                 s.organisation,
                 o.name,
                 o.name as organisation_name,
-                o.dataset,
+                sp.pipeline as dataset,
                 s.collection,
                 sp.pipeline,
                 l.endpoint,