Fixed Favorites saving issue