Word templates field spacing issue - composite address

Hi team,

I'm having an issue with the address field in word templates.

When I separate it by field, Street 2 is empty so it skips a line:

But when I use composite, the spacing is a mess:

Any thoughts?