Consolidate the favoriting functionality...