slight refactoring in Select Songs