Add selection and sorting options