Added sorting of songs too