BugFix: Complex stack queries work again