support for more queries, perf optimization
0.6.21