Fix for badges with null team_affiliation id