Queries rewritten again...