CFY-1671 fixed server and volume ref in relationship operations