Some filter fixes