Fix buildFilter in TopicMapper