Improve course selection