Also fixes issue where ORA grades were never updated, by including them in this check. TNL-5994 TNL-5995
