Filter Fixes (work in progress)