Add support for filtering units by services