diff --git a/invenio_theme/templates/invenio_theme/admin_header.html b/invenio_theme/templates/invenio_theme/admin_header.html
index 1e9138da..b80c4e63 100644
--- a/invenio_theme/templates/invenio_theme/admin_header.html
+++ b/invenio_theme/templates/invenio_theme/admin_header.html
@@ -21,7 +21,7 @@
     <span class="icon-bar"></span>
   </a>
   <ul class="nav navbar-nav">
-  {%- for item in menu.submenu('main').children if item.visible recursive %}
+  {%- for item in current_menu.submenu('main').children if item.visible recursive %}
     {%- if item.children -%}
         <li class="dropdown">.
           <a href="{{ item.url }}" style="display: inline-block; padding-right: 5px;"> {{ item.text|safe }} </a>
@@ -63,7 +63,7 @@
                 </div>
               </div>
             </li>
-            {%- for item in menu.submenu('settings').children if item.visible %}
+            {%- for item in current_menu.submenu('settings').children if item.visible %}
             {% if loop.first %}<li class="divider"></li>{% endif -%}
             <li><a href="{{ item.url }}">{{ item.text|safe }}</a></li>
             {%- endfor %}
diff --git a/invenio_theme/templates/invenio_theme/header.html b/invenio_theme/templates/invenio_theme/header.html
index 5435fe67..58545e38 100644
--- a/invenio_theme/templates/invenio_theme/header.html
+++ b/invenio_theme/templates/invenio_theme/header.html
@@ -46,7 +46,7 @@
         {%- endblock navbar_search %}
         {%- endif %}
         <ul class="nav navbar-nav">
-          {%- for item in menu.submenu('main').children|sort(attribute='order') if item.visible recursive %}
+          {%- for item in current_menu.submenu('main').children|sort(attribute='order') if item.visible recursive %}
           {%- if item.children %}
           <li class="dropdown{{ ' active' if item.active else ''}}">
             <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" href="{{ item.url }}">{{ item.text|safe }} <b class="caret"></b></a>
diff --git a/invenio_theme/templates/invenio_theme/header_login.html b/invenio_theme/templates/invenio_theme/header_login.html
index a717e2d2..e709d06c 100644
--- a/invenio_theme/templates/invenio_theme/header_login.html
+++ b/invenio_theme/templates/invenio_theme/header_login.html
@@ -24,7 +24,7 @@
       <span class="caret"></span>
     </button>
     <ul class="dropdown-menu" role="menu">
-      {%- for item in menu.submenu('settings').children if item.visible %}
+      {%- for item in current_menu.submenu('settings').children if item.visible %}
       <li><a href="{{ item.url }}">{{ item.text|safe }}</a></li>
       {%- endfor %}
       <li class="divider"></li>
diff --git a/invenio_theme/templates/invenio_theme/page_settings.html b/invenio_theme/templates/invenio_theme/page_settings.html
index a89e2b9f..98ec5c1b 100644
--- a/invenio_theme/templates/invenio_theme/page_settings.html
+++ b/invenio_theme/templates/invenio_theme/page_settings.html
@@ -19,7 +19,7 @@
           <div class="panel panel-default">
             <div class="panel-heading"><strong>{{ _('Settings') }}</strong></div>
             <ul class="list-group">
-            {%- for item in menu.submenu('settings').children if item.visible %}
+            {%- for item in current_menu.submenu('settings').children if item.visible %}
             {%- block settings_menu_item scoped %}
               <a
                 href="{{ item.url }}"
diff --git a/invenio_theme/templates/semantic-ui/invenio_theme/admin_header.html b/invenio_theme/templates/semantic-ui/invenio_theme/admin_header.html
index 1e9138da..b80c4e63 100644
--- a/invenio_theme/templates/semantic-ui/invenio_theme/admin_header.html
+++ b/invenio_theme/templates/semantic-ui/invenio_theme/admin_header.html
@@ -21,7 +21,7 @@
     <span class="icon-bar"></span>
   </a>
   <ul class="nav navbar-nav">
-  {%- for item in menu.submenu('main').children if item.visible recursive %}
+  {%- for item in current_menu.submenu('main').children if item.visible recursive %}
     {%- if item.children -%}
         <li class="dropdown">.
           <a href="{{ item.url }}" style="display: inline-block; padding-right: 5px;"> {{ item.text|safe }} </a>
@@ -63,7 +63,7 @@
                 </div>
               </div>
             </li>
-            {%- for item in menu.submenu('settings').children if item.visible %}
+            {%- for item in current_menu.submenu('settings').children if item.visible %}
             {% if loop.first %}<li class="divider"></li>{% endif -%}
             <li><a href="{{ item.url }}">{{ item.text|safe }}</a></li>
             {%- endfor %}
diff --git a/invenio_theme/templates/semantic-ui/invenio_theme/header.html b/invenio_theme/templates/semantic-ui/invenio_theme/header.html
index 86b91e1c..bc7cc294 100644
--- a/invenio_theme/templates/semantic-ui/invenio_theme/header.html
+++ b/invenio_theme/templates/semantic-ui/invenio_theme/header.html
@@ -55,7 +55,7 @@
               {%- endblock navbar_search %}
             {%- endif %}
           </li>
-            {%- for item in menu.submenu('main').children|sort(attribute='order') if item.visible recursive %}
+            {%- for item in current_menu.submenu('main').children|sort(attribute='order') if item.visible recursive %}
               {%- if item.children %}
               <li class="navbar-item navbar-options">
                 <div class="dropdown{{ ' active' if item.active else '' }}">
diff --git a/invenio_theme/templates/semantic-ui/invenio_theme/header_login.html b/invenio_theme/templates/semantic-ui/invenio_theme/header_login.html
index 900452a7..c95a7df3 100644
--- a/invenio_theme/templates/semantic-ui/invenio_theme/header_login.html
+++ b/invenio_theme/templates/semantic-ui/invenio_theme/header_login.html
@@ -32,7 +32,7 @@
         <div class="ui dropdown icon button floating">
           <i class="dropdown icon"></i>
           <div class="menu">
-            {%- for item in menu.submenu('settings').children if item.visible %}
+            {%- for item in current_menu.submenu('settings').children if item.visible %}
               <a class="item"
                 style="color:black;"
                 href="{{ item.url }}">{{ item.text|safe }}
diff --git a/invenio_theme/templates/semantic-ui/invenio_theme/page_settings.html b/invenio_theme/templates/semantic-ui/invenio_theme/page_settings.html
index 8d29cf30..c728eb05 100644
--- a/invenio_theme/templates/semantic-ui/invenio_theme/page_settings.html
+++ b/invenio_theme/templates/semantic-ui/invenio_theme/page_settings.html
@@ -26,7 +26,7 @@ <h1 class="ui large header">{{_("My account")}}</h1>
     {%- block settings_menu scoped %}
       <div class="ui vertical menu fluid">
         <strong class="header item">{{ _('Settings') }}</strong>
-        {%- for item in menu.submenu('settings').children if item.visible %}
+        {%- for item in current_menu.submenu('settings').children if item.visible %}
 
           {%- block settings_menu_item scoped %}
             <a