Refine delivery receipts handling