adjusted all query to simplify
Merge branch 'master' of https://github.com/baliga-lab/egrin2_django into GGBrowserweb
.