CAAERS-6360
Modify the way the grades are picked on AE page in Expedited Flow