[AMOS commit] restore MDL-24757 Fixed up course and category selectors