Fixes to performance curve (selective) grouping