diff --git a/brian_dashboard_manager/templating/eumetsat.py b/brian_dashboard_manager/templating/eumetsat.py
index fd11bfbd20f27121f3d20ce8dab94859213b404e..e7ba7191d46a8ddec45626b96182659f90daf632 100644
--- a/brian_dashboard_manager/templating/eumetsat.py
+++ b/brian_dashboard_manager/templating/eumetsat.py
@@ -90,6 +90,11 @@ def subscription_panel_generator(gridPos):
 
 def generate_eumetsat_multicast(subscriptions, datasource):
     panel_data = get_panel_data(subscriptions)
-    for dash in get_dashboard_data(panel_data, datasource, 'EUMET_MULTICAST'):
+    for dash in get_dashboard_data(
+            data=panel_data,
+            datasource=datasource,
+            tag='EUMET_MULTICAST',
+            panel_generator=subscription_panel_generator):
+
         yield dash
 
diff --git a/brian_dashboard_manager/templating/gws.py b/brian_dashboard_manager/templating/gws.py
index c517d72a6d1258789c12f29c71290ac823689ec2..7677f8ec09e32fa1de3cca312b607ec3e4a34930 100644
--- a/brian_dashboard_manager/templating/gws.py
+++ b/brian_dashboard_manager/templating/gws.py
@@ -78,11 +78,17 @@ def get_gws_indirect_panel_data(interfaces):
 def generate_gws(gws_data, datasource):
 
     panel_data = get_panel_data(gws_data)
-    for dash in get_dashboard_data(panel_data, datasource, 'GWS_DIRECT'):
+    for dash in get_dashboard_data(
+            data=panel_data,
+            datasource=datasource,
+            tag='GWS_DIRECT'):
         yield dash
 
 
 def generate_indirect(gws_data, datasource):
     panel_data = get_gws_indirect_panel_data(gws_data)
-    for dash in get_dashboard_data(panel_data, datasource, 'GWS_INDIRECT'):
+    for dash in get_dashboard_data(
+            data=panel_data,
+            datasource=datasource,
+            tag='GWS_INDIRECT'):
         yield dash