PIM-2127 : update the filter utility to be product specific