updates for issues VIVO-507 and VIVO-589