[TASK] CGL fix - use tabs