diff --git a/trunk/xsl/xhtml/results.xsl b/trunk/xsl/xhtml/results.xsl
index b25ee9e..bb19a05 100644
--- a/trunk/xsl/xhtml/results.xsl
+++ b/trunk/xsl/xhtml/results.xsl
@@ -9,35 +9,39 @@
 
 <xsl:template name="results">
 
-    <h1>
-        <xsl:value-of select="$locale_strings[@id='results_heading_1']" />&#160;
-        <xsl:value-of select="//results/@pagesize * (//results/@currentpage - 1) + 1" />&#160;
-        <xsl:value-of select="$locale_strings[@id='results_heading_2']" />&#160;
-        <xsl:choose>
-            <xsl:when test="(//results/@pagesize * //results/@currentpage) &lt; //results/@resultcount">
-                <xsl:value-of select="//results/@pagesize * //results/@currentpage" />
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="//results/@resultcount" />
-            </xsl:otherwise>
-        </xsl:choose>&#160;
-        <xsl:value-of select="$locale_strings[@id='results_heading_3']" />&#160;
-        <xsl:value-of select="//results/@resultcount" />&#160;
-        <xsl:value-of select="$locale_strings[@id='results_heading_4']" />
-    </h1>
+    <xsl:for-each select="//page/results">
 
-    <xsl:call-template name="results-listing"/>
+        <h1>
+            <xsl:value-of select="$locale_strings[@id='results_heading_1']" />&#160;
+            <xsl:value-of select="//results/@pagesize * (//results/@currentpage - 1) + 1" />&#160;
+            <xsl:value-of select="$locale_strings[@id='results_heading_2']" />&#160;
+            <xsl:choose>
+                <xsl:when test="(//results/@pagesize * //results/@currentpage) &lt; //results/@resultcount">
+                    <xsl:value-of select="//results/@pagesize * //results/@currentpage" />
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="//results/@resultcount" />
+                </xsl:otherwise>
+            </xsl:choose>&#160;
+            <xsl:value-of select="$locale_strings[@id='results_heading_3']" />&#160;
+            <xsl:value-of select="//results/@resultcount" />&#160;
+            <xsl:value-of select="$locale_strings[@id='results_heading_4']" />
+        </h1>
 
-    <xsl:if test="//results/@lastpage &gt; 1">
-        <xsl:call-template name="pagination-arrows"/>
-    </xsl:if>
+        <xsl:call-template name="results-listing"/>
+
+        <xsl:if test="//results/@lastpage &gt; 1">
+            <xsl:call-template name="pagination-arrows"/>
+        </xsl:if>
+
+    </xsl:for-each>
 
 </xsl:template>
 
 
 <xsl:template name="results-listing">
     <div class="results">
-        <xsl:for-each select="//results/result">
+        <xsl:for-each select="result">
             <div class="result">
                 <a>
                     <xsl:attribute name="href">
diff --git a/trunk/xsl/xhtml/upload.xsl b/trunk/xsl/xhtml/upload.xsl
index 44da6c2..7b26e23 100644
--- a/trunk/xsl/xhtml/upload.xsl
+++ b/trunk/xsl/xhtml/upload.xsl
@@ -524,6 +524,7 @@
     <xsl:if test="$start &lt;= $end">
 
         <xsl:call-template name="for-loop">
+
             <xsl:with-param name="start">
                 <xsl:value-of select="$start + 1"/>
             </xsl:with-param>
diff --git a/trunk/xsl/xhtml/xhtml-body.xsl b/trunk/xsl/xhtml/xhtml-body.xsl
index 44d3c39..bfca7f1 100644
--- a/trunk/xsl/xhtml/xhtml-body.xsl
+++ b/trunk/xsl/xhtml/xhtml-body.xsl
@@ -19,14 +19,14 @@
 
         <xsl:call-template name="header"/>
 
+        <xsl:call-template name="searchbar" />
+
+        <xsl:if test="string-length(//@username)=0">
+            <xsl:call-template name="loginbox" />
+        </xsl:if>
+
         <xsl:choose>
             <xsl:when test="//frontpage">
-                <xsl:call-template name="searchbar" />
-
-                <xsl:if test="string-length(//@username)=0">
-                    <xsl:call-template name="loginbox" />
-                </xsl:if>
-
 
                 <xsl:call-template name="tagcloud" />
 
@@ -35,10 +35,11 @@
                 </xsl:if>
 
                 <xsl:call-template name="splashbox" />
+
+                <xsl:call-template name="results"/>
             </xsl:when>
 
             <xsl:when test="//page/video">
-                <xsl:call-template name="searchbar" />
 <!--
                 <xsl:call-template name="tagbar" />
 -->
@@ -51,7 +52,6 @@
             </xsl:when>
 
             <xsl:when test="//page//results">
-                <xsl:call-template name="searchbar" />
                 <xsl:call-template name="results"/>
             </xsl:when>
         </xsl:choose>