fix up service ids