Adding support for filtering taxonomies