Revert "Simplify school date filter"

This reverts commit 922bcd0eb5a60a4acebd9d8823ac9f4d631497ec.