mayor changes in filter and FilterWrapper