[issue-305] Handle multiple ID formats