Cleanup

Cleanup two queries to work with alternate prefixes.