favourites and comments inclusion changes