Improve get course by filter

Improve get course by filter