Add to/remove from favourites logic improved