PIM-865 : refactor category filter