The label link in popular-labels goes to the site-wide context regardless of spaceKey

Popular-labels macro displays the resulting list or heatmap that only displays the labels of the space in question, when I specify the spaceKey. Here the macro works as it should. The problem is, that in the resulting list, the labels link to the global label page, not the space-specific label page. For example, the link "howto" links to the page /label/howto instead of the page /label/spacename/howto , which I think should be the logical behaviour. In a large site such as our university's, this kind of behaviour makes the labels, or at least the popular-labels macro as a navigating tool, nearly unusable.