Updated group_containers_by_cluster so as to cover the null set