PIM-3236 : for category filter, move logic from filter bundle to catalog