Updates to include global subject sorting for grades, other fixes to
grade listing.