Simpler way to fix the per column filtering bug.