improve connectorId handling