[service] bug fixes