Ensure collection add-on comments get saved properly