Query planner changes to support most single axis queries