Move field import loop out of group import loop