Improve handling empty favs list