Fixing import bug, reducing queries for teachers.