Fixes in filter and out filter