Merge pull request #5841 from neilLasrado/student_batch

Minor fixed for Schools