Isolate our queries. Fixes #1