Also allow lookup by connected service ID