PIM-3197 : re-work the ChoiceFilter to clean ProductFilterUtility