Empty classroom query and bug fixes.