Improve sorting/ordering options.