Amazon HD shuffle mode

Playing a playlist in shuffle mode doesn't work as expected.

Firstly Shuffle does nothing without Auto-Fill enabled. I guess this is expected but could probably catch people out.

If I press the shuffle button while a track is playing then then Play Queue is shuffled with whatever is already there and the track I am playing may be near the end of that shuffled queue so I never get to hear everything before it. I have to scroll back to the start of the Play Queue and play from there. I also get the playlist I want mixed randomly with whatever was playing before it which is usually not what I want.

If "shuffle" is already selected when I select a track in a playlist then the Play Queue is automatically filled in original, not shuffled, order. This is also not expected behaviour.

I found the only way I can shuffle a playlist is as follows:

1. Ensure Auto-Fill is enabled in Settings -> Playback
2. Clear the Play Queue
3. Start playing the first song in the Playlist
4. Enable Shuffle
5. Scroll back to the start of the Play Queue
6. Play the first track

There has to be an easier way than this. If "shuffle" is selected in the context of a playlist then the expected behaviour, from that one button press, is that:

1. Current track (if any) stops playing
2. All tracks of playlist play once each in random order

If the shuffle button is pressed when I track is already playing then the expected behaviour is that:

1. Remaining unplayed tracks of playlist play after current track in random order

Any playlist that is selected while shuffle mode is already selected should just play in random order without getting mixed with other stuff that was already played.