School fixes: Student Watchlist