Update the grade template to display criteria/option labels if they're provided, otherwise use the 'name' field