diff --git a/core.lua b/core.lua
index da1a243..8179a10 100644
--- a/core.lua
+++ b/core.lua
@@ -95,7 +95,7 @@ do
 end
 
 function public.on_load()
-    public.version = '3.6.0'
+    public.version = '3.6.1'
     public.bids_loaded = false
     public.current_owner_page = nil
     public.last_owner_page_requested = nil
diff --git a/util/filter.lua b/util/filter.lua
index 8a3784f..8cb6bdc 100644
--- a/util/filter.lua
+++ b/util/filter.lua
@@ -568,11 +568,12 @@ function public.indented_post_query_string(components)
             if component[3] then
                 str = str..': '..'|cffff9218'..component[3]..'|r'
             end
-            local top = tremove(stack)
-            if tonumber(top) and top > 1 then
-                tinsert(stack, top - 1)
-            elseif top == '*' then
-                tinsert(stack, top)
+            while getn(stack) > 0 and stack[getn(stack)] ~= '*' do
+                local top = tremove(stack)
+                if tonumber(top) and top > 1 then
+                    tinsert(stack, top - 1)
+                    break
+                end
             end
         end
     end