Changed to URI based favourites
Different message for create/update favourite