Registration Store Locator

Hello WC Lovers!

When a vendor registers in my website here there are 2 fields where needs to add the address in the wizzard store set up.

I am showing 2 pictures to explain the problem:

1-There are to places where they can add their addressess! The top one seems to just be used to show the address on the Store page. If I just fill this one the Store will not appear in the Store List and there is no geolocation attached to the store.

2-If I just use the second one the store will appear with geolocation on the Store List, but the address information will not display!

Is there any code that I could add that would join this 2 address fields into one? (So that when a vendor adds their address it would go automatically to their store page information and the geolocation in Store List would work aswell)

Thank you for your help!