Eliminate another wasteful query