Added TODO message
Changes to filters
Changes to school filters
Made new filter code generic and applied it to pages types that need it
Merge branch 'feature/filters-refactor' into staging