utf8 fix and org ordering fix