In nested spaces, the realtime email subject & link label in the email content should not display WebHome

Using the realtime watchlist in 8.0-SNAPSHOT (so nested spaces), the email subject looks like Watchlist for document "WebHome" (xwiki:Sandbox.This is the full story.This chapter is in progress.WebHome).
As well as in the email content, the link to reach the document is WebHome

WebHome is not really what the user expects, because he created This chapter is in progress document, not WebHome.

IMO, the email subject should be Watchlist for document "This chapter is in progress" and the link label in the email content should be This chapter is in progress.

I would also remove the entire path of the document from the email subject to put it in the email content