better UI/label for flag to include service address on invoices, RT#29406