Links in the Blog Archive page are broken

If the blog entries of a given month are shown on the Blog.Archive page, the headlines linking to each entry are shown as broken, as if the blog entry does not exist.

Example:
http://www.xwiki.org/xwiki/bin/view/Blog/Archive?space=Blog&year=2013&month=7

Blog.Archive is in xwiki/2.0 syntax but uses Blog.BlogCode, which is in xwiki/2.1
BlogCode uses xwiki/2.1 features like >>path: expressions, this seems to break it.

Automatically migrate the Archive page to xwiki/2.1 syntax in the Wiki-editor fixed that problem for me, but then the archive links shown if the Archive page without paramters are broken.

I guess around line 35 the links to the yearly archive:

* [[$year ($yearArticleCount)>>Blog.Archive?space=${blogDoc.space}&year=${year}]]

should be

* [[$year ($yearArticleCount)>>Blog.Archive||param='space=${blogDoc.space}&year=${year}']]

and the same for the month-links to make them with with xwiki/2.1

(This might still break if the blog space has single quotes in its name ... not sure how to avoid that)