Minor UI changes to ensure that Athletes are properly selected from the search form