More filter fixes