reworked associated xref handling to maintain association of a group