fixed bugs in ExecutionPlan