Add URI.escape for service_name and section_name