Add conversion of evaluate return value for empty values and strings