[RFC] fix/billing-taxes