Oops, query fixes.