Add select_related calls when collecting grade/enrollment info