Re #986 - Changes for proper VIAF dereferencing