Order selection and display fix