Refactor Album and AlbumToc Searches