Some more refactoring on select selected