School fixes: View matches