Update to work with different elements score display -refs BT#8052