improve autopick query performance
Merge pull request #47 from kprevas/master

improve autopick query performance