PIM-1771 : fix flexible filter