Fixed remove to look up the right PlaylistEntry to remove

Special case in remove to not remove the playing song