Issue query perf improvements