Favorite Button bugfix