diff --git a/brian_dashboard_manager/templating/helpers.py b/brian_dashboard_manager/templating/helpers.py
index 8156dc5cd9fe346e4c50d86822567d16b847c308..e3f58ac01649a948830268f28eaf933fe23a5374 100644
--- a/brian_dashboard_manager/templating/helpers.py
+++ b/brian_dashboard_manager/templating/helpers.py
@@ -11,8 +11,6 @@ from itertools import product
 from functools import partial, reduce
 from string import ascii_uppercase
 
-from docutils.nodes import description
-
 from brian_dashboard_manager.templating.render import create_panel, \
     create_panel_target, create_dropdown_panel
 
@@ -560,14 +558,16 @@ def get_router_dashboard_data(interfaces):
         panel_title = f'{router} - {{}} - {interface_name} - {description}'
 
         dashboard_name = interface['router']
+        dashboard = result.setdefault(dashboard_name, {})
+
+        base_interface = interface_name.split('.')[0]
+        dropdown = dashboard.setdefault(base_interface, [])
 
-        dashboard = result.get(dashboard_name, [])
-        dashboard.append({
+        dropdown.append({
             'title': panel_title,
-            'interface': interface_name,  # TODO NAME or interface data?
+            'interface': interface_name,
             'hostname': host
         })
-        result[dashboard_name] = dashboard
 
     return result