Improve efficiency of the educator dashboard. Issue #436.