Updates the team and application select ids.
Merge commit '2357237e2bda06f1c30e79c96c7bca145a54f91c' into HEAD