diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
index 7f625fd38e..9f27f98b8b 100644
--- a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
+++ b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
@@ -75,7 +75,7 @@ local function submenu(prefix, node)
 	<% for j, v in pairs(index) do 
 		local nnode = node.nodes[v.name]
 		local href = controller .. prefix .. v.name
-		href = (v.query) and href .. luci.http.build_querystring(v.query) or href
+		href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
 		%>
 		<li>
 			<span<% if nnode._menu_selected then %> class="yellowtext"<%end%>><a href="<%=href%>"><%=nnode.title%></a></span>
diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
index d1b7518715..6852b386e0 100644
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -75,7 +75,7 @@ local function submenu(prefix, node)
 	<% for j, v in pairs(index) do 
 		local nnode = node.nodes[v.name]
 		local href = controller .. prefix .. v.name
-		href = (v.query) and href .. luci.http.build_querystring(v.query) or href
+		href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href
 		%>
 		<li>
 			<span<% if nnode._menu_selected then %> class="blacktext"<%end%>><a href="<%=href%>"><%=nnode.title%></a></span>