perf-improve: speed up query
Merge remote branch 'origin/release' into qa