School fixes: School form, Matches