final queries
Merge branch 'clean' of https://github.com/yaleIMs/webapp into clean