Small filter fixes