cleanup filename
fix in planner for lost sources from branch name collisions, code cleanup, improved fix GroupBy/Every split