Validation added, team-filter added