Added course type detection when indicated in location