Shopify tax invoice problem

Hello Shopify community,
Since the new update of tax invoices of Shopify in The Netherlands I moved from an invoice app to this new function for invoices that my customers can download.
There is something wrong with the variables shown on the invoice.

Most importantly:

  • The company name is missing on both billing adress and shipping adress
    In order to fix two things have to be changed:
  1. Show the shipping adress from the order as the shipping adress on the invoice (including company name)
  2. Show the billing invoice from the order as the billing adress on the invoice (inclusing company name)

Without the company name the invoice is useless for tax purposes.
Shopify please fixe this.

We have the same problem, did you get a response /solution from anyone?

Unfortunately the only solution Shopify provided was ‘try to use an app’ since they are not sure when this is finished.