Merge "Fix url in list_services"