more improvement for unicode