Modified course types taken rule, added Gaius qry