added new mapper. fixed filter.