[CLC-2098] Handle the non-official courses