Made adjustments to FilterWrapper