Improved building of planner tree + improved late materialization