filter improvements, thanks tim.speetjens