Added html entities converting for value