More consistent handling of song list fetching
More consistent handling of song list fetching