diff --git a/ogcp/templates/macros.html b/ogcp/templates/macros.html
index e91a2ef..6f19a30 100644
--- a/ogcp/templates/macros.html
+++ b/ogcp/templates/macros.html
@@ -1,7 +1,7 @@
 {% macro scopes_tree_collapse(scopes, state='') -%}
 
 <ul id="scopes" class="nav flex-column nav-pills">
-  {{ scopes_tree_collapse_level(scopes["scope"], 1, "", state) }}
+  {{ scopes_tree_collapse_level(scopes["scope"], "", state) }}
 </ul>
 <script>
     // Launch the javascript on document ready, so all the global functions exists
@@ -19,7 +19,7 @@
 
 {% endmacro %}
 
-{% macro scopes_tree_collapse_level(scopes, i, parent_id, state) -%}
+{% macro scopes_tree_collapse_level(scopes, parent_id, state) -%}
 {% for scope in scopes %}
   <li id="{{ scope["name"]|replace(".", "_")|replace(" ", "_") }}_{{ scope["id"] }}" class="nav-item">
     {% if " ".join(scope["ip"]) %}
@@ -29,7 +29,7 @@
                {% if scope.get("selected", False) %}checked{% endif %}
                name="{{ scope["name"] }}_{{ scope["id"] }}" />
     {% endif %}
-    <a class="nav-link {% if not scope["scope"] %}disabled{% endif %}" href="#id{{parent_id ~ "_" ~ i ~ "-" ~ loop.index}}"
+    <a class="nav-link {% if not scope["scope"] %}disabled{% endif %}" href="#scope{{parent_id ~ "-" ~ loop.index}}"
                        {% if scope["scope"] %}data-toggle="collapse"{% endif %}>
       {% if "state" in scope %}
         <i class="nav-icon fa-circle
@@ -42,8 +42,8 @@
       {{ scope["name"] }}
     </a>
     {% if scope["scope"] %}
-      <ul class="nav flex-column collapse level{{i}}" id="id{{parent_id ~ "_" ~ i ~ "-" ~ loop.index}}">
-          {{ scopes_tree_collapse_level(scope["scope"], i + 1, parent_id ~ "_" ~ i ~ "-" ~ loop.index, state) }}
+      <ul class="nav flex-column collapse level{{i}}" id="scope{{parent_id ~ "-" ~ loop.index}}">
+          {{ scopes_tree_collapse_level(scope["scope"], parent_id ~ "-" ~ loop.index, state) }}
       </ul>
     {% endif %}
   </li>