cleaning up and combining queries.

Incorporating remaining comments from @cmc333333 on https://github.com/18F/peacecorps-site/pull/8