Added support for filtering by component