LILY-396: Made archiving and unarchiving deals/cases more consistent with eachother