[refactor] Unicode and sorting