Cleanup of the logic around queuing a song.
Switched to use song/search instead of playlisting to gather the set of songs