filter logic modification