More complex handling of fav photos by favs storage object
refs #1114 #1116