refactor filter and map

Original message was deleted