Move the track vs. album artist fix from BrowseLibrary to the source of
the problem (albumsQuery)