RF-13909: fix valueExpression handling