Fix ellipsize bug, last update till submitting to Google