Thank you for your suggestion.
I added another GS partner and selected it manually when I created the PO. Due to that on the output I have now 3 addresses although the labels of the address boxes may need small adjustments - this looks very promising but ultimately business will decide 
.
I'll keep you posted.