Re #986 - cahnges for proper handling of VIAF