Add filter improvements