Modified Product filtering code