Added product filter logic