filters logic changed