diff --git a/modules/titling.xml b/modules/titling.xml
index 5f1fc60..0899181 100644
--- a/modules/titling.xml
+++ b/modules/titling.xml
@@ -47,13 +47,13 @@
 			For the HTML title, strip out any markup (e.g., emphasis), as this is not interpreted within the <title> tag, resulting in raw HTML markup in the window title. Ick. We do this by switching to "strip" mode.
 		-->
 		<common formats="/html/xhtml/">
-			<xsl:if test="index-of(('tutorial', 'laboratory', 'assignment', 'project'), /document/@class)">
+			<xsl:if test="index-of(('tutorial', 'laboratory', 'assignment', 'project', 'question set'), /document/@class)">
 				<xsl:if test="$showanswers='yes'">
 					<xsl:choose>
 						<xsl:when test="index-of(('tutorial', 'laboratory'), /document/@class)">
 							<xsl:text>Selected Answers for </xsl:text>
 						</xsl:when>
-						<xsl:when test="index-of(('assignment', 'project'), /document/@class)">
+						<xsl:when test="index-of(('assignment', 'project', 'question set'), /document/@class)">
 							<xsl:text>Sample Solution for </xsl:text>
 						</xsl:when>
 					</xsl:choose>
@@ -64,7 +64,7 @@
 				<xsl:text> </xsl:text>
 				<xsl:value-of select="/document/@sequence-number" />
 				<!-- If the title's empty, there's no point in including the ": ". -->
-				<xsl:if test="node()">
+				<xsl:if test="node() and (/document/@class != 'question set')">
 					<xsl:text>: </xsl:text>
 				</xsl:if>
 			</xsl:if>
@@ -129,13 +129,13 @@
 	<template name="document-title-title" match="document/title" mode="title">
 		<common formats="/html/xhtml/">
 			<h1>
-			    <xsl:if test="index-of(('tutorial', 'laboratory', 'assignment', 'project'), /document/@class)">
+			    <xsl:if test="index-of(('tutorial', 'laboratory', 'assignment', 'project', 'question set'), /document/@class)">
 					<xsl:if test="$showanswers='yes'">
 						<xsl:choose>
     						<xsl:when test="index-of(('tutorial', 'laboratory'), /document/@class)">
 								<xsl:text>Selected Answers for </xsl:text>
 							</xsl:when>
-                            <xsl:when test="index-of(('assignment', 'project'), /document/@class)">
+                            <xsl:when test="index-of(('assignment', 'project', 'question set'), /document/@class)">
 								<xsl:text>Sample Solution for </xsl:text>
 							</xsl:when>
 						</xsl:choose>
@@ -146,7 +146,7 @@
 					<xsl:text> </xsl:text>
 					<xsl:value-of select="/document/@sequence-number" />
 					<!-- If the title's empty, there's no point in including the ": ". -->
-					<xsl:if test="node()">
+                    <xsl:if test="node() and (/document/@class != 'question set')">
 						<xsl:text>: </xsl:text>
 					</xsl:if>
 				</xsl:if>