Add support for filtering categories