diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt
index 8ced8f7..b7e8805 100644
--- a/Builder/IISMainHandler/build.txt
+++ b/Builder/IISMainHandler/build.txt
@@ -1 +1 @@
-989
\ No newline at end of file
+991
\ No newline at end of file
diff --git a/Common/dataobjects/Thread.cs b/Common/dataobjects/Thread.cs
index 52008c9..bab5fad 100644
--- a/Common/dataobjects/Thread.cs
+++ b/Common/dataobjects/Thread.cs
@@ -189,8 +189,7 @@ namespace FLocal.Common.dataobjects {
 
 			XElement result = new XElement("thread",
 				new XElement("id", this.id),
-				new XElement("firstPostId", this.firstPostId),
-				new XElement("topicstarter", this.topicstarter.exportToXmlForViewing(context)),
+				new XElement("firstPost", this.firstPost.exportToXml(context)),
 				new XElement("title", this.title),
 				new XElement("lastPostId", this.lastPostId),
 				new XElement("lastPostDate", this.lastPostDate.ToXml()),
@@ -198,9 +197,6 @@ namespace FLocal.Common.dataobjects {
 				new XElement("isLocked", this.isLocked),
 				new XElement("totalPosts", this.totalPosts),
 				new XElement("totalViews", this.totalViews),
-				new XElement("bodyShort", this.firstPost.bodyShort),
-				new XElement("layerId", this.firstPost.layerId),
-				new XElement("layerName", this.firstPost.layer.name),
 				context.formatTotalPosts(this.totalPosts)
 			);
 			if(context.account != null) {
diff --git a/templates/Full/elems/ThreadInfo.xslt b/templates/Full/elems/ThreadInfo.xslt
index ecf381f..3d2d48a 100644
--- a/templates/Full/elems/ThreadInfo.xslt
+++ b/templates/Full/elems/ThreadInfo.xslt
@@ -12,7 +12,7 @@
 				</xsl:otherwise>
 			</xsl:choose>
 			<td align="left">
-				<xsl:attribute name="title"><xsl:value-of select="bodyShort"/></xsl:attribute>
+				<xsl:attribute name="title"><xsl:value-of select="firstPost/post/bodyShort"/></xsl:attribute>
 				<xsl:if test="isAnnouncement='true'">
 					<img src="/static/images/sticky.gif" width="16" height="16" alt="" border="0" style="vertical-align: text-bottom;" />
 					<xsl:text> </xsl:text>
@@ -24,10 +24,10 @@
 				<img alt="*" hspace="5" style="vertical-align: text-bottom">
 					<xsl:choose>
 						<xsl:when test="afterLastRead&lt;=lastPostId">
-							<xsl:attribute name="src">/static/images/message-<xsl:value-of select="layerName"/>-notread.gif</xsl:attribute>
+							<xsl:attribute name="src">/static/images/message-<xsl:value-of select="firstPost/post/layerName"/>-notread.gif</xsl:attribute>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:attribute name="src">/static/images/message-<xsl:value-of select="layerName"/>-read.gif</xsl:attribute>
+							<xsl:attribute name="src">/static/images/message-<xsl:value-of select="firstPost/post/layerName"/>-read.gif</xsl:attribute>
 						</xsl:otherwise>
 					</xsl:choose>
 				</img>
@@ -53,7 +53,7 @@
 				</xsl:if>
 			</td>
 			<td align="left" nowrap="nowrap">
-				<xsl:apply-templates select="topicstarter/user" mode="userLink"/>
+				<xsl:apply-templates select="firstPost/post/poster/user" mode="userLink"/>
 			</td>
 			<td align="center">
 				<xsl:value-of select="totalViews"/>
diff --git a/templates/Lite/elems/ThreadInfo.xslt b/templates/Lite/elems/ThreadInfo.xslt
index 839eef6..f7e3d34 100644
--- a/templates/Lite/elems/ThreadInfo.xslt
+++ b/templates/Lite/elems/ThreadInfo.xslt
@@ -18,8 +18,8 @@
 				<xsl:if test="isLocked='true'">
 					<xsl:text>{l}</xsl:text>
 				</xsl:if>
-				<xsl:if test="layerName='offtop'">{o}</xsl:if>
-				<xsl:if test="layerName='garbage'">{g}</xsl:if>
+				<xsl:if test="firstPost/post/layerName='offtop'">{o}</xsl:if>
+				<xsl:if test="firstPost/post/layerName='garbage'">{g}</xsl:if>
 				<xsl:choose>
 					<xsl:when test="afterLastRead&lt;=lastPostId">
 						<xsl:text>(*</xsl:text>
@@ -44,7 +44,7 @@
 				</a>
 			</td>
 			<td align="left" nowrap="nowrap">
-				<xsl:apply-templates select="topicstarter/user" mode="userLink"/>
+				<xsl:apply-templates select="firstPost/post/poster/user" mode="userLink"/>
 			</td>
 		</tr>
 	</xsl:template>