Fixed major bug in Favorite functionality