VIVO-369 and related property and individual visibility cleanup