mattdrayer/api-2632-fix: Fixed bugs related to proforma grade calculation/retrieval