PMC-20077 - work on id resolving