added GroupedSelection support