Fixed numbering issue, sort options