Cleanup

Cleanup two queries to work with alternate prefixes.
Merge pull request #1 from laryn/patch-1

Cleanup