Fix the filter stuff