Added support for valid_school before filter.