fixes to group completion