more protections on database querying
Merge branch 'master' of https://github.com/jcburke14/dugong