issue 377 - team fields