Various changes to education filter
Merge branch 'master' into production