School fixes: Match View