moved selection logic to the collection
use key prop so react isn't confused by a resort