Fix mapping in filter