finished feature/search_album