We should also confirm that we invalidate invalid count queries. Not a show-stopper, though.