Merge pull request #8 from ghing/master

Merge in some queries, mostly related to drug charges