Macros breaking on migrating from Server to Cloud

Issue Summary

Create from the template and PPR macro breaks on migration from server to Cloud

Steps to Reproduce

1. take an export of space where PPR with parent and Create from template macro is used.
2. Import it to cloud instance.

Expected Results

Both the macros will work or render as expected.

Actual Results

Both the macros will not work or render as expected.

In PPR macro the with parent field will show the parent ID (which is not the actual parent ID of the parent page)- here it should show simply the parent page title

In Create from Template macro field Title of page to be created will show the page ID again it should show the title of the page from where new page can be created.

Workaround

We need to manually fix the, with parent in PPR macro and Title of page to be created in Create from template macro field manually in PPR and same as