OC-6048
some more fixes to repeating group display