Match only first word when adding or removing from the team

Fixes #3