PIM-3236 : re-work the category filter to use context