Simplify query.
Queries work, but they're still not quite right.