Fixes to add groups to f3f races