Updated select() and selectAll()