Fix entity value output
ERM29426 ERM29419
[4.2.x]
Change-Id: I856e1842347de205f51b1c8a9cf9262d68031d43