Renamed and removed some sorting options