Improve options to sort and filter results