more bug fixes
filter fix