Rework and tidy selection handling