VIVO-630 and VIVO-634: orcidId fixes