Fixed Favorite handling