Query optimized. Tie up loose ends.