more filter fixes