The next or prev song is not coming from my current playlist, folder or album.

The behaviour I'm expecting is to update the queue when I switch to a new playlist so that the next or prev song is coming from that playlist not from the initial queue.