fixed service parsing