OC-6048
more fixes to repeating group issues