[DF-1534] Fixed different selection use cases.