Several filter improvements.