Address bugs in selection