Refactoring queryies, working though
Merge branch 'develop' of https://github.com/thekage91/web-snp into develop