Refined address and Order invoiceDate