Use 'resource-id' value if available.

- Version 5.3.0
- resource-id provides a more descriptive id if available, compared to
uinqueId