#270 Add albumId/artistId to get around showAlbum issue