Changed select a bit

Almost ready for playlist, but need help with a few pts