filter fixes
filter fixes