CB-5066: fixed issue with visual elements not being referenced correctly