Album info search: got rid of unnecessary pick and merged 2 functions