Fix broken filter application/clearing