Inconsistency in Tag Cloud Panel

Hi, I noticed that there is some inconsistency caused by the new Tag Cloud macro in the Tag Cloud panel. Whenever I view a page that includes a Tag Cloud that only shows tags of a given Space I am shown the exact same thing in the Panel. This is not bad all together because this is even better for my need. However, what is bad is that as soon as I go to another page without said macro I will get the full Cloud again.

Now, like I said, this is not bad for me, so i just changed the Panel so it always shows only the space tags unless I am on Main. Looks like this:

#panelheader($msg.get("xe.panels.tagcloud.title"))
#if("${doc.space}" != "Main")
  #set($tagCloudSpace="${doc.space}")
#end
#includeInContext("XWiki.TagCloud")
#panelfooter()

Anyhow, if I was looking for a Tag cloud that always shows the full Tag Cloud, even if the one on the page should not I'd be experiencing a bug here. So it should be changed to either be entirely independent or enable the user to pick which way it should be on a space level.