Review sort options. Close #9