Fixed searching and course getting