Minor updates to selection