Issue query perf improvements

right... I will use that method here!