Fix skipped sort when excluding composed characters
Merge Number and Currency sections