YH-587: replace collection type if it is a service