[APOLLO-2673] - added grouping on task list