add model properties and improve course filter