Page Links via Upfront Builder

Hi. Using the Upfront Builder, when you put in place a link you can only select the page or post you want to link to from the list shown. This is great but causes one major problem.

If we want to link to a page while in build mode, changing the site url later, it breaks all internal links after we complete the move. It would be much better if, using the Upfront Builder, we could add in the link we want to use, rather than having to pick it from a list. In doing so we could set the internal link '/...' leaving off the url! Can this be done as an option?

Would make the whole process of adding links using Upfront much better and not break them when we change urls t a later date.

Thanks.