Lots of fixes for new course search