School fixes: View matches (map)