added support for course type and locations without room number (like GYM, TRK)