Fixes in filter impl