Remove the costly sub-select in the admin tool and add better detail
to the student view.