Issue #5: The updates that remove fields are now handled properly