Wrong links in included pages due to ri tags without parameters

In the Home page of the my space, I used the composition plugin and the include-page plugin to render a few pages as a navigation menu.

To facilitate users to go to the actual page for editing, I added a link to the actual page in the first line of the page.

To illustrate,
I have a page called Project Admin that has a link to itself. The storage format will show

<h1><ac:link /></h1>

and the page will display "Project Admin"

However when the "Project Admin" page is included in the "Home" page. The link "Home" will be displayed instead of "Project Admin".

This breaks the link.

I observed that the normal links will specify the parameter such as

<h1><ac:link><ri:page ri:content-title="Project Admin" /></ac:link></h1>