#736 avoid quotes on service names