OuterTemplate.GetGroupName Fix to include User Group

The corrected Template is below:

<xsl:template name="OuterTemplate.GetGroupName">
<xsl:param name="GroupName"/>
<xsl:param name="GroupType"/>
<xsl:choose>
<xsl:when test="string-length(normalize-space($GroupName)) = 0">
<xsl:value-of select="$BlankGroup"/>
</xsl:when>
<xsl:otherwise>
<xsl:choose>
<xsl:when test="$GroupType='URL'">
<xsl:variable name="Url">
<xsl:call-template name="OuterTemplate.FormatValueIntoUrl">
<xsl:with-param name="Value" select="$GroupName"/>
</xsl:call-template>
</xsl:variable>
<xsl:call-template name="OuterTemplate.GetPageNameFromUrlRecursive">
<xsl:with-param name="Url" select="$Url"/>
</xsl:call-template>
</xsl:when>
<xsl:when test="$GroupType='User'">
<xsl:value-of select="substring-after($GroupName,'#')"/>
</xsl:when>

<xsl:otherwise>
<xsl:value-of select="$GroupName" />
</xsl:otherwise>
</xsl:choose>
</xsl:otherwise>
</xsl:choose>
</xsl:template>

Design: Rolling up Corporate Forms from all Intranet Department Sites

I'm working on creating a rollup content Query Web part (CQWP) to display all the corporate forms listed within our intranet. The basic architecture was to create a custom content type as follows:

[Corporate Form]
From preexsisting columns

• Title:Single line of text
• URL:Hyperlink or Picture
• Comments:Multiple lines of text
• Owner:Person or Group

New custom column

• HelpURL:Publishing Hyperlink

Each site will have a list to store the [Corporate Form] content type. This list will allow administrators to add an entry for every corporate form either as an attatchment or a link to another list (such as for Infopath or standard lists).