Fix enhance token to match for greek/hebrew tokens