diff --git a/stammb_psn2html.xsl b/stammb_psn2html.xsl
index b30415278224e119769e875eeef63dce9ca85e00..fd387ddec2435d809cc05f6e9b488cba6d78f25a 100644
--- a/stammb_psn2html.xsl
+++ b/stammb_psn2html.xsl
@@ -23,7 +23,7 @@ Es erzeugt eine XHTML-Liste aus der TEI/XML-Datei des Personenregisters. -->
                 </head>
                 <body>
                     <ul>
-                        <xsl:apply-templates select="//persName">
+                        <xsl:apply-templates select="//text//persName">
                             <xsl:sort select="term/@sortKey"/>
                         </xsl:apply-templates>
                     </ul>
@@ -38,31 +38,31 @@ Es erzeugt eine XHTML-Liste aus der TEI/XML-Datei des Personenregisters. -->
                 <xsl:when test="@type = 'preferred'">
                     <a><xsl:attribute name="href"><xsl:value-of select="concat($psnpfad,../@xml:id)"/></xsl:attribute><xsl:choose>
                         <xsl:when test="term/forename and term/surname">
-                            <xsl:value-of select="term/surname"/><xsl:text>, </xsl:text><xsl:value-of select="term/forename"/>
+                            <xsl:value-of select="term/normalize-space(surname)"/><xsl:text>, </xsl:text><xsl:value-of select="term/normalize-space(forename)"/>
                         </xsl:when>
                         <xsl:when test="term/name">
-                            <xsl:value-of select="term/name"/>
+                            <xsl:value-of select="term/normalize-space(name)"/>
                         </xsl:when>
                     </xsl:choose></a>
                 </xsl:when>
                 <xsl:when test="@type = 'variant'">
                     <xsl:choose>
                         <xsl:when test="term/forename and term/surname">
-                            <xsl:value-of select="term/surname"/><xsl:text>, </xsl:text><xsl:value-of select="term/forename"/>
+                            <xsl:value-of select="normalize-space(term/surname)"/><xsl:text>, </xsl:text><xsl:value-of select="normalize-space(term/forename)"/>
                         </xsl:when>
                         <xsl:when test="term/name">
-                            <xsl:value-of select="term/name"/>
+                            <xsl:value-of select="normalize-space(term/name)"/>
                         </xsl:when>
                     </xsl:choose><xsl:text> → </xsl:text><a><xsl:attribute name="href"><xsl:value-of select="concat($psnpfad,../@xml:id)"/></xsl:attribute><xsl:choose>
                         <xsl:when test="../persName[@type='preferred']/term/forename and ../persName[@type='preferred']/term/surname">
-                            <xsl:value-of select="../persName[@type='preferred']/term/surname"/><xsl:text>, </xsl:text><xsl:value-of select="../persName[@type='preferred']/term/forename"/>
+                            <xsl:value-of select="../persName[@type='preferred']/term/normalize-space(surname)"/><xsl:text>, </xsl:text><xsl:value-of select="../persName[@type='preferred']/term/normalize-space(forename)"/>
                         </xsl:when>
                         <xsl:when test="../persName[@type='preferred']/term/name">
-                            <xsl:value-of select="../persName[@type='preferred']/term/name"/>
+                            <xsl:value-of select="../persName[@type='preferred']/term/normalize-space(name)"/>
                         </xsl:when>
                     </xsl:choose></a>
                 </xsl:when>
             </xsl:choose>            
         </li>
     </xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file