Various changes to education filter