From Cesar: make selection and two-selection working with the new