Update Record Grouping to allow grouping of only changed records
- also optimize for performance