PR for 1985 against 3.3: display only courses from the current vsite.

Relate to issue #1985