fixed cleanup job pipeline name and group counting