Changes in filter logic