Update for ExhaustiveQueryPlanner