Fixing null in filter