Add new filter logic