Changed queries, but need tests to verify statues are respected.