Cleaning up tag leakage from invoice to payment.