diff --git a/ogcp/templates/macros.html b/ogcp/templates/macros.html
index e114692..5e10b0f 100644
--- a/ogcp/templates/macros.html
+++ b/ogcp/templates/macros.html
@@ -23,9 +23,9 @@
{% endmacro %}
-{% macro scopes_tree_collapse_level(scopes, parent_room, parent_id, state, selection_mode) -%}
+{% macro scopes_tree_collapse_level(scopes, parent_server, parent_room, parent_id, state, selection_mode) -%}
{% for scope in scopes %}
-
+
{% if scope["type"] == "server" %}
{% endif %}
-
{% if "state" in scope %}
{% if scope["scope"] %}
-
- {{ scopes_tree_collapse_level(scope["scope"], parent_room, parent_id ~ "-" ~ loop.index, state, selection_mode) }}
+
+ {{ scopes_tree_collapse_level(scope["scope"], parent_server, parent_room, parent_id ~ "-" ~ loop.index, state, selection_mode) }}
{% endif %}
diff --git a/ogcp/templates/tree.html b/ogcp/templates/tree.html
index fc06105..5cc53c9 100644
--- a/ogcp/templates/tree.html
+++ b/ogcp/templates/tree.html
@@ -1,2 +1,2 @@
{% import "macros.html" as macros %}
-{{ macros.scopes_tree_collapse_level(scopes["scope"], '', '', '', 'scopes') }}
+{{ macros.scopes_tree_collapse_level(scopes["scope"], parent_server, '', '', '', 'scopes') }}
diff --git a/ogcp/views.py b/ogcp/views.py
index 5be8647..4e444f3 100644
--- a/ogcp/views.py
+++ b/ogcp/views.py
@@ -445,7 +445,8 @@ def scopes_tree():
params = request.args.to_dict()
server = get_server_from_ip_port(params['server'])
scopes = get_scopes_from_server(server)
- return render_template('tree.html', scopes=scopes)
+ return render_template('tree.html', scopes=scopes,
+ parent_server=server.name)
@app.route('/scopes/')