fixed more grouping features