Simplify uniqueness-mechanism in search results
Make search look for both Artist and AlbumArtist

fixes #673