Adobe forms: Country of ship-to party not shown when country is the same as customer

[BillGiotDel]

I am working with Adobe Forms on the cloud via BRF+ on an S/4 HANA system.

I am working in the Purchase Order Form template that works with a datasource.

The data comes from the service FDP_EF_PURCHASE_ORDER_SRV.

You have the address from the ship-to party.

<ShipToParty>   
   <AddressLine1>Name ShipToParty</AddressLine1>
   <AddressLine2>Streetname number</AddressLine2>
   <AddressLine3>Region</AddressLine3>
   <AddressLine4>Postal code city</AddressLine4>
   <AddressLine5>Country</AddressLine5>
   <AddressLine6></AddressLine6>
   <AddressLine7></AddressLine7>
   <AddressLine8></AddressLine8>
   <ShipToParty>0000100000</ShipToParty>
   <ShipToPartyAddressID>0000020000</ShipToPartyAddressID>
   <ShipToPartyEmailAddress>e-mail@e-mail.com</ShipToPartyEmailAddress>
   <ShipToPartyName>ShipToParty name</ShipToPartyName>
   <VatRegistration>VATNumber</VatRegistration>
</ShipToParty>

The country is missing from that address. (AddressLine5)

I assume this is because the country of the ship-to party is the same as the country of the customer that is sending the form.

There is currently no way to extend the datasource in S/4 HANA.
I don't want to use a custom field because this will pollute the database.

Is there a configuration in BRF+ that will make sure the country is always filled in in the datasource?
Maybe there is another solution for adding the country to the datasource?