Got new filter logic working