Swap the order of set and sort
Add some more Unicode character classes