Query optimized.
Merge branch 'develop' of github.com:idekerlab/nexo into develop