Index: /main/trunk/model-sites-dev/opotiki/collect/all-template-coll/etc/collectionConfig.xml
===================================================================
--- /main/trunk/model-sites-dev/opotiki/collect/all-template-coll/etc/collectionConfig.xml	(revision 34313)
+++ /main/trunk/model-sites-dev/opotiki/collect/all-template-coll/etc/collectionConfig.xml	(revision 34314)
@@ -56,5 +56,5 @@
 your new collection off the collection <b>text-template-coll</b>.</p>
 </displayItem>
-		<displayItem assigned="true" lang="en" name="name">Kohinga Korero</displayItem>
+		<displayItem assigned="true" lang="en" name="name">general collection template</displayItem>
 		<displayItem assigned="true" lang="en" name="allfields">all</displayItem>
 		<displayItem assigned="true" lang="en" name="text">text</displayItem>
@@ -84,124 +84,123 @@
 		<displayItem assigned="true" lang="en" name=".allfields">allfields</displayItem>
 	</displayItemList>
-	<format>
-			<gsf:template name="choose-title">
-				<gsf:choose-metadata>
-					<gsf:metadata name="wmtb.Title"/>
-					<gsf:metadata name="Title"/>
-					<gsf:default>Untitled</gsf:default>
-				</gsf:choose-metadata>
-			</gsf:template>
+	<format>  <gsf:template name="choose-title">
+    <gsf:choose-metadata>
+      <gsf:metadata name="wmtb.Title"/>
+      <gsf:metadata name="Title"/>
+      <gsf:default>Untitled</gsf:default>
+    </gsf:choose-metadata>
+  </gsf:template>
 <!--
 CUSTOM TEMLPLATE display-metadata: Displaying WMTB document metadata meaningful to digital library visitors
 -->
-			<gsf:template name="display-metadata">
+  <gsf:template name="display-metadata">
 <!--
 First some general WMTB collecton metadata
 -->
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Author"/>
-					<gsf:when test="exists"><br/> Author(s):Â <gsf:metadata name="wmtb.Author"/></gsf:when>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="wmtb.HapuOrIwi"/>
-					<gsf:when test="exists"><br/> HapÅ« or Iwi:Â <gsf:metadata name="wmtb.HapuOrIwi"/></gsf:when>
-				</gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Author" select="root"/>
+      <gsf:when test="exists"><br/> Author(s):Â <gsf:metadata name="wmtb.Author" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.HapuOrIwi" select="root"/>
+      <gsf:when test="exists"><br/> HapÅ« or Iwi:Â <gsf:metadata name="wmtb.HapuOrIwi" select="root"/></gsf:when>
+    </gsf:switch>
 <!--
 Now any waiata-specific metadata
 -->
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Singer"/>
-					<gsf:when test="exists"><br/> Singer(s):Â <gsf:metadata name="wmtb.Singer"/></gsf:when>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Lyricist"/>
-					<gsf:when test="exists"><br/> Lyricist(s):Â <gsf:metadata name="wmtb.Lyricist"/></gsf:when>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Composer"/>
-					<gsf:when test="exists"><br/> Composer(s):Â <gsf:metadata name="wmtb.Composer"/></gsf:when>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Genre"/>
-					<gsf:when test="exists"><br/> Genre(s):Â <gsf:metadata name="wmtb.Genre"/></gsf:when>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="wmtb.MediaType"/>
-					<gsf:when test="exists"><br/> MediaType(s):Â <gsf:metadata name="wmtb.MediaType"/></gsf:when>
-				</gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Singer" select="root"/>
+      <gsf:when test="exists"><br/> Singer(s):Â <gsf:metadata name="wmtb.Singer" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Lyricist" select="root"/>
+      <gsf:when test="exists"><br/> Lyricist(s):Â <gsf:metadata name="wmtb.Lyricist" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Composer" select="root"/>
+      <gsf:when test="exists"><br/> Composer(s):Â <gsf:metadata name="wmtb.Composer" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Genre" select="root"/>
+      <gsf:when test="exists"><br/> Genre(s):Â <gsf:metadata name="wmtb.Genre" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.MediaType" select="root"/>
+      <gsf:when test="exists"><br/> MediaType(s):Â <gsf:metadata name="wmtb.MediaType" select="root"/></gsf:when>
+    </gsf:switch>
 <!--
 Any whakaahua-specific metadata
 -->
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Caption"/>
-					<gsf:when test="exists"><br/> Caption(s):Â <gsf:metadata name="wmtb.Caption"/></gsf:when>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Photographer"/>
-					<gsf:when test="exists"><br/> Photographer(s):Â <gsf:metadata name="wmtb.Photographer"/></gsf:when>
-				</gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Caption" select="root"/>
+      <gsf:when test="exists"><br/> Caption(s):Â <gsf:metadata name="wmtb.Caption" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Photographer" select="root"/>
+      <gsf:when test="exists"><br/> Photographer(s):Â <gsf:metadata name="wmtb.Photographer" select="root"/></gsf:when>
+    </gsf:switch>
 <!--
 Still whakaahua specific meta: If we have width meta for a photo, we display something like:"Dimensions: Width w x Height h Units (size: 100kb)" with question mark for unknown height
 -->
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Width"/>
-					<gsf:when test="exists">
-						<br/>
-						<xsl:text>Dimensions:Â </xsl:text>
-						<gsf:metadata name="wmtb.Width"/>
-						<xsl:text> wÂ x</xsl:text>
-						<gsf:switch>
-							<gsf:metadata name="wmtb.Height"/>
-							<gsf:when test="exists">Â <gsf:metadata name="wmtb.Height"/>h</gsf:when>
-							<gsf:otherwise>Â ?h</gsf:otherwise>
-						</gsf:switch>
-						<gsf:switch>
-							<gsf:metadata name="wmtb.Units"/>
-							<gsf:when test="exists">Â <gsf:metadata name="wmtb.Units"/>Â units</gsf:when>
-						</gsf:switch>
-						<gsf:switch>
-							<gsf:metadata name="wmtb.Size"/>
-							<gsf:when test="exists">Â (size:<gsf:metadata name="wmtb.Size"/>)</gsf:when>
-						</gsf:switch>
-					</gsf:when>
-				</gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Width" select="root"/>
+      <gsf:when test="exists">
+        <br/>
+        <xsl:text>Dimensions:Â </xsl:text>
+        <gsf:metadata name="wmtb.Width" select="root"/>
+        <xsl:text> wÂ x</xsl:text>
+        <gsf:switch>
+          <gsf:metadata name="wmtb.Height" select="root"/>
+          <gsf:when test="exists">Â <gsf:metadata name="wmtb.Height" select="root"/>h</gsf:when>
+          <gsf:otherwise>Â ?h</gsf:otherwise>
+        </gsf:switch>
+        <gsf:switch>
+          <gsf:metadata name="wmtb.Units" select="root"/>
+          <gsf:when test="exists">Â <gsf:metadata name="wmtb.Units" select="root"/>Â units</gsf:when>
+        </gsf:switch>
+        <gsf:switch>
+          <gsf:metadata name="wmtb.Size" select="root"/>
+          <gsf:when test="exists">Â (size:<gsf:metadata name="wmtb.Size" select="root"/>)</gsf:when>
+        </gsf:switch>
+      </gsf:when>
+    </gsf:switch>
 <!--
 Back to general WMTB collecton metadata
 -->
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Location"/>
-					<gsf:when test="exists"><br/> Location(s):Â <gsf:metadata name="wmtb.Location"/></gsf:when>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="wmtb.DateType"/>
-					<gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType"/>:Â </gsf:when>
-					<gsf:otherwise><br/>Date:Â </gsf:otherwise>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Day"/>
-					<gsf:when test="exists"><gsf:metadata name="wmtb.Day"/>/</gsf:when>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Month"/>
-					<gsf:when test="exists"><gsf:metadata name="wmtb.Month"/>/</gsf:when>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Year"/>
-					<gsf:when test="exists">
-						<gsf:metadata name="wmtb.Year"/>
-					</gsf:when>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="wmtb.Type"/>
-					<gsf:when test="exists"><br/> Type:Â <gsf:metadata name="wmtb.Type"/></gsf:when>
-				</gsf:switch>
-				<gsf:switch>
-					<gsf:metadata name="Source"/>
-					<gsf:when test="exists">
-						<br/>
-						<i>(<gsf:metadata name="Source"/>)</i>
-					</gsf:when>
-				</gsf:switch>
-			</gsf:template>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Location" select="root"/>
+      <gsf:when test="exists"><br/> Location(s):Â <gsf:metadata name="wmtb.Location" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.DateType" select="root"/>
+      <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType" select="root"/>:Â </gsf:when>
+      <gsf:otherwise><br/>Date:Â </gsf:otherwise>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Day" select="root"/>
+      <gsf:when test="exists"><gsf:metadata name="wmtb.Day" select="root"/>/</gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Month" select="root"/>
+      <gsf:when test="exists"><gsf:metadata name="wmtb.Month" select="root"/>/</gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Year" select="root"/>
+      <gsf:when test="exists">
+        <gsf:metadata name="wmtb.Year" select="root"/>
+      </gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Type" select="root"/>
+      <gsf:when test="exists"><br/> Type:Â <gsf:metadata name="wmtb.Type" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="Source" select="root"/>
+      <gsf:when test="exists">
+        <br/>
+        <i>(<gsf:metadata name="Source" select="root"/>)</i>
+      </gsf:when>
+    </gsf:switch>
+  </gsf:template>
 <!--
 END OF CUSTOM TEMPLATE display-metadata
@@ -210,22 +209,23 @@
 modify the collection description template to output the "this collection contains X documents and was last built Y days ago" message
 -->
-			<xsl:template name="coll-description">
-				<p>
-					<gslib:collectionDescriptionTextAndServicesLinks/>
-				</p>
-				<xsl:variable name="raw_date">
-					<gslib:collectionMeta name="buildDate"/>
-				</xsl:variable>
-				<xsl:variable name="formatted_date">
-					<xsl:value-of select="util:formatTimeStamp($raw_date, 0, 3, /page/@lang)"/>
-				</xsl:variable>
-				<xsl:variable name="numdocs">
-					<gslib:collectionMeta name="numDocs"/>
-				</xsl:variable>
-				<p>
-					<xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'about.standarddescriptiondays', concat($numdocs, ';', $formatted_date))"/>
-				</p>
-			</xsl:template>
-		</format>
+  <xsl:template name="coll-description">
+    <p>
+      <gslib:collectionDescriptionTextAndServicesLinks/>
+    </p>
+    <xsl:variable name="raw_date">
+      <gslib:collectionMeta name="buildDate"/>
+    </xsl:variable>
+    <xsl:variable name="formatted_date">
+      <xsl:value-of select="util:formatTimeStamp($raw_date, 0, 3, /page/@lang)"/>
+    </xsl:variable>
+    <xsl:variable name="numdocs">
+      <gslib:collectionMeta name="numDocs"/>
+    </xsl:variable>
+    <p>
+      <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'about.standarddescriptiondays', concat($numdocs, ';', $formatted_date))"/>
+    </p>
+  </xsl:template>
+
+</format>
 	<search type="lucene">
 		<level name="document">
@@ -235,5 +235,5 @@
 			<displayItem lang="en" name="name">section</displayItem>
 		</level>
-		<defaultLevel name="document"/>
+		<defaultLevel name="section"/>
 		<index name="allfields">
 			<displayItem lang="en" name="name">all</displayItem>
@@ -322,7 +322,13 @@
 				</td>
 				<td>
-					<gsf:link type="document">
-						<xsl:call-template name="choose-title"/>
-					</gsf:link>
+					<gsf:switch>
+						<gsf:metadata name="Title" select="parent"/>
+						<gsf:when test="exists"><gsf:link type="document"><xsl:call-template name="choose-title"/></gsf:link>Â ofÂ <gsf:link select="root" type="document"><gsf:metadata name="wmtb.Title" select="root"/></gsf:link></gsf:when>
+						<gsf:otherwise>
+							<gsf:link type="document">
+								<xsl:call-template name="choose-title"/>
+							</gsf:link>
+						</gsf:otherwise>
+					</gsf:switch>
 					<xsl:call-template name="display-metadata"/>
 				</td>
@@ -608,3 +614,4 @@
 		</serviceRack>
 	</serviceRackList>
+	<buildOption name="remove_empty_classifications"/>	
 </CollectionConfig>
Index: /main/trunk/model-sites-dev/opotiki/collect/img-template-coll/etc/collectionConfig.xml
===================================================================
--- /main/trunk/model-sites-dev/opotiki/collect/img-template-coll/etc/collectionConfig.xml	(revision 34313)
+++ /main/trunk/model-sites-dev/opotiki/collect/img-template-coll/etc/collectionConfig.xml	(revision 34314)
@@ -42,10 +42,9 @@
 	</metadataList>
 	<displayItemList>
-		<displayItem assigned="true" lang="en" name="name">image template collection</displayItem>
+		<displayItem assigned="true" lang="en" name="name">image collection template</displayItem>
 		<displayItem assigned="true" lang="en" name="allfields">all</displayItem>
 		<displayItem assigned="true" lang="en" name="text">text</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Title">titles</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.HapuOrIwi">hapÅ« or iwi</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.Author">authors</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Caption">captions</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Photographer">photographers</displayItem>
@@ -62,4 +61,5 @@
 		<displayItem assigned="true" lang="en" name="document">document</displayItem>
 		<displayItem assigned="true" lang="en" name="section">section</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.Author">authors</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Singer">singers</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Lyricist">lyricists</displayItem>
@@ -85,6 +85,6 @@
 -->
     <gsf:switch>
-      <gsf:metadata name="wmtb.HapuOrIwi"/>
-      <gsf:when test="exists"><br/> HapÅ« or Iwi:Â <gsf:metadata name="wmtb.HapuOrIwi"/></gsf:when>
+      <gsf:metadata name="wmtb.HapuOrIwi" select="root"/>
+      <gsf:when test="exists"><br/> HapÅ« or Iwi:Â <gsf:metadata name="wmtb.HapuOrIwi" select="root"/></gsf:when>
     </gsf:switch>
 <!--
@@ -92,10 +92,10 @@
 -->
     <gsf:switch>
-      <gsf:metadata name="wmtb.Caption"/>
-      <gsf:when test="exists"><br/> Caption(s):Â <gsf:metadata name="wmtb.Caption"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.Photographer"/>
-      <gsf:when test="exists"><br/> Photographer(s):Â <gsf:metadata name="wmtb.Photographer"/></gsf:when>
+      <gsf:metadata name="wmtb.Caption" select="root"/>
+      <gsf:when test="exists"><br/> Caption(s):Â <gsf:metadata name="wmtb.Caption" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Photographer" select="root"/>
+      <gsf:when test="exists"><br/> Photographer(s):Â <gsf:metadata name="wmtb.Photographer" select="root"/></gsf:when>
     </gsf:switch>
 <!--
@@ -103,22 +103,22 @@
 -->
     <gsf:switch>
-      <gsf:metadata name="wmtb.Width"/>
+      <gsf:metadata name="wmtb.Width" select="root"/>
       <gsf:when test="exists">
         <br/>
         <xsl:text>Dimensions:Â </xsl:text>
-        <gsf:metadata name="wmtb.Width"/>
+        <gsf:metadata name="wmtb.Width" select="root"/>
         <xsl:text> wÂ x</xsl:text>
         <gsf:switch>
-          <gsf:metadata name="wmtb.Height"/>
-          <gsf:when test="exists">Â <gsf:metadata name="wmtb.Height"/>h</gsf:when>
+          <gsf:metadata name="wmtb.Height" select="root"/>
+          <gsf:when test="exists">Â <gsf:metadata name="wmtb.Height" select="root"/>h</gsf:when>
           <gsf:otherwise>Â ?h</gsf:otherwise>
         </gsf:switch>
         <gsf:switch>
-          <gsf:metadata name="wmtb.Units"/>
-          <gsf:when test="exists">Â <gsf:metadata name="wmtb.Units"/>Â units</gsf:when>
+          <gsf:metadata name="wmtb.Units" select="root"/>
+          <gsf:when test="exists">Â <gsf:metadata name="wmtb.Units" select="root"/>Â units</gsf:when>
         </gsf:switch>
         <gsf:switch>
-          <gsf:metadata name="wmtb.Size"/>
-          <gsf:when test="exists">Â (size:<gsf:metadata name="wmtb.Size"/>)</gsf:when>
+          <gsf:metadata name="wmtb.Size" select="root"/>
+          <gsf:when test="exists">Â (size:<gsf:metadata name="wmtb.Size" select="root"/>)</gsf:when>
         </gsf:switch>
       </gsf:when>
@@ -128,35 +128,35 @@
 -->
     <gsf:switch>
-      <gsf:metadata name="wmtb.Location"/>
-      <gsf:when test="exists"><br/> Location(s):Â <gsf:metadata name="wmtb.Location"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.DateType"/>
-      <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType"/>:Â </gsf:when>
+      <gsf:metadata name="wmtb.Location" select="root"/>
+      <gsf:when test="exists"><br/> Location(s):Â <gsf:metadata name="wmtb.Location" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.DateType" select="root"/>
+      <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType" select="root"/>:Â </gsf:when>
       <gsf:otherwise><br/>Date:Â </gsf:otherwise>
     </gsf:switch>
     <gsf:switch>
-      <gsf:metadata name="wmtb.Day"/>
-      <gsf:when test="exists"><gsf:metadata name="wmtb.Day"/>/</gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.Month"/>
-      <gsf:when test="exists"><gsf:metadata name="wmtb.Month"/>/</gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.Year"/>
+      <gsf:metadata name="wmtb.Day" select="root"/>
+      <gsf:when test="exists"><gsf:metadata name="wmtb.Day" select="root"/>/</gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Month" select="root"/>
+      <gsf:when test="exists"><gsf:metadata name="wmtb.Month" select="root"/>/</gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Year" select="root"/>
       <gsf:when test="exists">
-        <gsf:metadata name="wmtb.Year"/>
+        <gsf:metadata name="wmtb.Year" select="root"/>
       </gsf:when>
     </gsf:switch>
     <gsf:switch>
-      <gsf:metadata name="wmtb.Type"/>
-      <gsf:when test="exists"><br/> Type:Â <gsf:metadata name="wmtb.Type"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="Source"/>
+      <gsf:metadata name="wmtb.Type" select="root"/>
+      <gsf:when test="exists"><br/> Type:Â <gsf:metadata name="wmtb.Type" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="Source" select="root"/>
       <gsf:when test="exists">
         <br/>
-        <i>(<gsf:metadata name="Source"/>)</i>
+        <i>(<gsf:metadata name="Source" select="root"/>)</i>
       </gsf:when>
     </gsf:switch>
@@ -194,5 +194,5 @@
 			<displayItem lang="en" name="name">section</displayItem>
 		</level>
-		<defaultLevel name="document"/>
+		<defaultLevel name="section"/>
 		<index name="allfields">
 			<displayItem lang="en" name="name">all</displayItem>
@@ -265,7 +265,13 @@
     </td>
     <td>
-      <gsf:link type="document">
-        <xsl:call-template name="choose-title"/>
-      </gsf:link>
+      <gsf:switch>
+        <gsf:metadata name="Title" select="parent"/>
+        <gsf:when test="exists"><gsf:link type="document"><xsl:call-template name="choose-title"/></gsf:link>Â ofÂ <gsf:link select="root" type="document"><gsf:metadata name="wmtb.Title" select="root"/></gsf:link></gsf:when>
+        <gsf:otherwise>
+          <gsf:link type="document">
+            <xsl:call-template name="choose-title"/>
+          </gsf:link>
+        </gsf:otherwise>
+      </gsf:switch>
       <xsl:call-template name="display-metadata"/>
     </td>
@@ -370,58 +376,58 @@
 			<option name="-buttonname" value="Source"/>
 		</classifier>
-		<format>
-			<gsf:template match="documentNode">
-				<gsf:switch>
-					<gsf:metadata name="FileFormat"/>
-					<gsf:when test="equals" test-value="video"/>
-					<gsf:otherwise>
-						<td valign="top">
-							<gsf:link type="document">
-								<gsf:icon type="document"/>
-							</gsf:link>
-						</td>
-					</gsf:otherwise>
-				</gsf:switch>
-				<td valign="top">
-					<gsf:link type="source">
-						<gsf:choose-metadata>
-							<gsf:metadata name="thumbicon"/>
-							<gsf:metadata name="srcicon"/>
-						</gsf:choose-metadata>
-					</gsf:link>
-				</td>
-				<td valign="top">
-					<gsf:metadata name="equivDocLink"/>
-					<gsf:metadata name="equivDocIcon"/>
-					<gsf:metadata name="/equivDocLink"/>
-				</td>
-				<td valign="top">
-					<gsf:link type="document">
+		<format>  <gsf:template match="documentNode">
+    <gsf:switch>
+      <gsf:metadata name="FileFormat"/>
+      <gsf:when test="equals" test-value="video"/>
+      <gsf:otherwise>
+        <td valign="top">
+          <gsf:link type="document">
+            <gsf:icon type="document"/>
+          </gsf:link>
+        </td>
+      </gsf:otherwise>
+    </gsf:switch>
+    <td valign="top">
+      <gsf:link type="source">
+        <gsf:choose-metadata>
+          <gsf:metadata name="thumbicon"/>
+          <gsf:metadata name="srcicon"/>
+        </gsf:choose-metadata>
+      </gsf:link>
+    </td>
+    <td valign="top">
+      <gsf:metadata name="equivDocLink"/>
+      <gsf:metadata name="equivDocIcon"/>
+      <gsf:metadata name="/equivDocLink"/>
+    </td>
+    <td valign="top">
+      <gsf:link type="document">
 <!--
 Defined in the global format statement
 -->
-						<xsl:call-template name="choose-title"/>
-					</gsf:link>
-					<xsl:call-template name="display-metadata"/>
-				</td>
-			</gsf:template>
-			<gsf:template match="classifierNode[@classifierStyle = 'VList']">
-				<td valign="top">
-					<gsf:link style="static" type="classifier">
-						<gsf:icon type="classifier"/>
-					</gsf:link>
-				</td>
-				<td valign="top">
-					<gsf:link type="classifier">
-						<gsf:metadata name="Title"/>
-					</gsf:link>
-				</td>
-			</gsf:template>
-			<gsf:template match="classifierNode[@classifierStyle = 'HList']">
-				<gsf:link style="static" type="classifier">
-					<gsf:metadata name="Title"/>
-				</gsf:link>
-			</gsf:template>
-		</format>
+        <xsl:call-template name="choose-title"/>
+      </gsf:link>
+      <xsl:call-template name="display-metadata"/>
+    </td>
+  </gsf:template>
+  <gsf:template match="classifierNode[@classifierStyle = 'VList']">
+    <td valign="top">
+      <gsf:link style="static" type="classifier">
+        <gsf:icon type="classifier"/>
+      </gsf:link>
+    </td>
+    <td valign="top">
+      <gsf:link type="classifier">
+        <gsf:metadata name="Title"/>
+      </gsf:link>
+    </td>
+  </gsf:template>
+  <gsf:template match="classifierNode[@classifierStyle = 'HList']">
+    <gsf:link style="static" type="classifier">
+      <gsf:metadata name="Title"/>
+    </gsf:link>
+  </gsf:template>
+
+</format>
 	</browse>
 	<display>
@@ -509,3 +515,4 @@
 		</serviceRack>
 	</serviceRackList>
+	<buildOption name="remove_empty_classifications"/>
 </CollectionConfig>
Index: /main/trunk/model-sites-dev/opotiki/collect/song-template-coll/etc/collectionConfig.xml
===================================================================
--- /main/trunk/model-sites-dev/opotiki/collect/song-template-coll/etc/collectionConfig.xml	(revision 34313)
+++ /main/trunk/model-sites-dev/opotiki/collect/song-template-coll/etc/collectionConfig.xml	(revision 34314)
@@ -42,17 +42,13 @@
 	</metadataList>
 	<displayItemList>
-		<displayItem assigned="true" lang="en" name="name">song template collection</displayItem>
+		<displayItem assigned="true" lang="en" name="name">song collection template</displayItem>
 		<displayItem assigned="true" lang="en" name="allfields">all</displayItem>
 		<displayItem assigned="true" lang="en" name="text">text</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Title">titles</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.HapuOrIwi">hapÅ« or iwi</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.Author">authors</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Singer">singers</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Lyricist">lyricists</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Composer">composers</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Genre">genre</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.Caption">captions</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.Photographer">photographers</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.BoardOrSubcollection">board or subcollection</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Year">date</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Location">location</displayItem>
@@ -66,8 +62,11 @@
 		<displayItem assigned="true" lang="en" name="document">document</displayItem>
 		<displayItem assigned="true" lang="en" name="section">section</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.Author">authors</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.Caption">captions</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.Photographer">photographers</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.BoardOrSubcollection">board or subcollection</displayItem>
 		<displayItem assigned="true" lang="en" name="dc.Title,ex.dc.Title,Title">titles</displayItem>
 		<displayItem assigned="true" lang="en" name="shortDescription">kohingak</displayItem>
 		<displayItem assigned="true" lang="en" name=".allfields">allfields</displayItem>
-		<displayItem assigned="true" lang="en" name="description">Template for waiata only collections</displayItem>
 	</displayItemList>
 	<format>  <gsf:template name="choose-title">
@@ -86,6 +85,6 @@
 -->
     <gsf:switch>
-      <gsf:metadata name="wmtb.HapuOrIwi"/>
-      <gsf:when test="exists"><br/> HapÅ« or Iwi:Â <gsf:metadata name="wmtb.HapuOrIwi"/></gsf:when>
+      <gsf:metadata name="wmtb.HapuOrIwi" select="root"/>
+      <gsf:when test="exists"><br/> HapÅ« or Iwi:Â <gsf:metadata name="wmtb.HapuOrIwi" select="root"/></gsf:when>
     </gsf:switch>
 <!--
@@ -93,22 +92,22 @@
 -->
     <gsf:switch>
-      <gsf:metadata name="wmtb.Singer"/>
-      <gsf:when test="exists"><br/> Singer(s):Â <gsf:metadata name="wmtb.Singer"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.Lyricist"/>
-      <gsf:when test="exists"><br/> Lyricist(s):Â <gsf:metadata name="wmtb.Lyricist"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.Composer"/>
-      <gsf:when test="exists"><br/> Composer(s):Â <gsf:metadata name="wmtb.Composer"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.Genre"/>
-      <gsf:when test="exists"><br/> Genre(s):Â <gsf:metadata name="wmtb.Genre"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.MediaType"/>
-      <gsf:when test="exists"><br/> MediaType(s):Â <gsf:metadata name="wmtb.MediaType"/></gsf:when>
+      <gsf:metadata name="wmtb.Singer" select="root"/>
+      <gsf:when test="exists"><br/> Singer(s):Â <gsf:metadata name="wmtb.Singer" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Lyricist" select="root"/>
+      <gsf:when test="exists"><br/> Lyricist(s):Â <gsf:metadata name="wmtb.Lyricist" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Composer" select="root"/>
+      <gsf:when test="exists"><br/> Composer(s):Â <gsf:metadata name="wmtb.Composer" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Genre" select="root"/>
+      <gsf:when test="exists"><br/> Genre(s):Â <gsf:metadata name="wmtb.Genre" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.MediaType" select="root"/>
+      <gsf:when test="exists"><br/> MediaType(s):Â <gsf:metadata name="wmtb.MediaType" select="root"/></gsf:when>
     </gsf:switch>
 <!--
@@ -116,35 +115,35 @@
 -->
     <gsf:switch>
-      <gsf:metadata name="wmtb.Location"/>
-      <gsf:when test="exists"><br/> Location(s):Â <gsf:metadata name="wmtb.Location"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.DateType"/>
-      <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType"/>:Â </gsf:when>
+      <gsf:metadata name="wmtb.Location" select="root"/>
+      <gsf:when test="exists"><br/> Location(s):Â <gsf:metadata name="wmtb.Location" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.DateType" select="root"/>
+      <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType" select="root"/>:Â </gsf:when>
       <gsf:otherwise><br/>Date:Â </gsf:otherwise>
     </gsf:switch>
     <gsf:switch>
-      <gsf:metadata name="wmtb.Day"/>
-      <gsf:when test="exists"><gsf:metadata name="wmtb.Day"/>/</gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.Month"/>
-      <gsf:when test="exists"><gsf:metadata name="wmtb.Month"/>/</gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.Year"/>
+      <gsf:metadata name="wmtb.Day" select="root"/>
+      <gsf:when test="exists"><gsf:metadata name="wmtb.Day" select="root"/>/</gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Month" select="root"/>
+      <gsf:when test="exists"><gsf:metadata name="wmtb.Month" select="root"/>/</gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Year" select="root"/>
       <gsf:when test="exists">
-        <gsf:metadata name="wmtb.Year"/>
+        <gsf:metadata name="wmtb.Year" select="root"/>
       </gsf:when>
     </gsf:switch>
     <gsf:switch>
-      <gsf:metadata name="wmtb.Type"/>
-      <gsf:when test="exists"><br/> Type:Â <gsf:metadata name="wmtb.Type"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="Source"/>
+      <gsf:metadata name="wmtb.Type" select="root"/>
+      <gsf:when test="exists"><br/> Type:Â <gsf:metadata name="wmtb.Type" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="Source" select="root"/>
       <gsf:when test="exists">
         <br/>
-        <i>(<gsf:metadata name="Source"/>)</i>
+        <i>(<gsf:metadata name="Source" select="root"/>)</i>
       </gsf:when>
     </gsf:switch>
@@ -182,5 +181,5 @@
 			<displayItem lang="en" name="name">section</displayItem>
 		</level>
-		<defaultLevel name="document"/>
+		<defaultLevel name="section"/>
 		<index name="allfields">
 			<displayItem lang="en" name="name">all</displayItem>
@@ -256,7 +255,13 @@
     </td>
     <td>
-      <gsf:link type="document">
-        <xsl:call-template name="choose-title"/>
-      </gsf:link>
+      <gsf:switch>
+        <gsf:metadata name="Title" select="parent"/>
+        <gsf:when test="exists"><gsf:link type="document"><xsl:call-template name="choose-title"/></gsf:link>Â ofÂ <gsf:link select="root" type="document"><gsf:metadata name="wmtb.Title" select="root"/></gsf:link></gsf:when>
+        <gsf:otherwise>
+          <gsf:link type="document">
+            <xsl:call-template name="choose-title"/>
+          </gsf:link>
+        </gsf:otherwise>
+      </gsf:switch>
       <xsl:call-template name="display-metadata"/>
     </td>
@@ -436,9 +441,8 @@
 	</browse>
 	<display>
-		<format>
-			<gsf:option name="TOC" value="true"/>
-			<gsf:option name="allowUserComments" value="false"/>
-			<gsf:option name="allowDocumentEditing" value="true"/>
-			<gsf:option name="allowMapGPSEditing" value="true"/>
+		<format>  <gsf:option name="TOC" value="true"/>
+  <gsf:option name="allowUserComments" value="false"/>
+  <gsf:option name="allowDocumentEditing" value="true"/>
+  <gsf:option name="allowMapGPSEditing" value="true"/>
 <!--
 Overwriting this template allows you to change the heading of the document.
@@ -491,5 +495,6 @@
 </gsf:template>
 -->
-		</format>
+
+</format>
 	</display>
 	<replaceListRef id="gs2-standard"/>
@@ -519,3 +524,4 @@
 		</serviceRack>
 	</serviceRackList>
+	<buildOption name="remove_empty_classifications"/>
 </CollectionConfig>
Index: /main/trunk/model-sites-dev/opotiki/collect/text-template-coll/etc/collectionConfig.xml
===================================================================
--- /main/trunk/model-sites-dev/opotiki/collect/text-template-coll/etc/collectionConfig.xml	(revision 34313)
+++ /main/trunk/model-sites-dev/opotiki/collect/text-template-coll/etc/collectionConfig.xml	(revision 34314)
@@ -42,5 +42,5 @@
 	</metadataList>
 	<displayItemList>
-		<displayItem assigned="true" lang="en" name="name">text template collection</displayItem>
+		<displayItem assigned="true" lang="en" name="name">text collection template</displayItem>
 		<displayItem assigned="true" lang="en" name="allfields">all</displayItem>
 		<displayItem assigned="true" lang="en" name="text">text</displayItem>
@@ -48,11 +48,4 @@
 		<displayItem assigned="true" lang="en" name="wmtb.HapuOrIwi">hapÅ« or iwi</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Author">authors</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.Singer">singers</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.Lyricist">lyricists</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.Composer">composers</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.Genre">genre</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.Caption">captions</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.Photographer">photographers</displayItem>
-		<displayItem assigned="true" lang="en" name="wmtb.BoardOrSubcollection">board or subcollection</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Year">date</displayItem>
 		<displayItem assigned="true" lang="en" name="wmtb.Location">location</displayItem>
@@ -66,8 +59,14 @@
 		<displayItem assigned="true" lang="en" name="document">document</displayItem>
 		<displayItem assigned="true" lang="en" name="section">section</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.Singer">singers</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.Lyricist">lyricists</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.Composer">composers</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.Genre">genre</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.Caption">captions</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.Photographer">photographers</displayItem>
+		<displayItem assigned="true" lang="en" name="wmtb.BoardOrSubcollection">board or subcollection</displayItem>
 		<displayItem assigned="true" lang="en" name="dc.Title,ex.dc.Title,Title">titles</displayItem>
 		<displayItem assigned="true" lang="en" name="shortDescription">kohingak</displayItem>
 		<displayItem assigned="true" lang="en" name=".allfields">allfields</displayItem>
-		<displayItem assigned="true" lang="en" name="description">Template for kÅrero (text) only collections</displayItem>
 	</displayItemList>
 	<format>  <gsf:template name="choose-title">
@@ -86,43 +85,43 @@
 -->
     <gsf:switch>
-      <gsf:metadata name="wmtb.Author"/>
-      <gsf:when test="exists"><br/> Author(s):Â <gsf:metadata name="wmtb.Author"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.HapuOrIwi"/>
-      <gsf:when test="exists"><br/> HapÅ« or Iwi:Â <gsf:metadata name="wmtb.HapuOrIwi"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.Location"/>
-      <gsf:when test="exists"><br/> Location(s):Â <gsf:metadata name="wmtb.Location"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.DateType"/>
-      <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType"/>:Â </gsf:when>
+      <gsf:metadata name="wmtb.Author" select="root"/>
+      <gsf:when test="exists"><br/> Author(s):Â <gsf:metadata name="wmtb.Author" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.HapuOrIwi" select="root"/>
+      <gsf:when test="exists"><br/> HapÅ« or Iwi:Â <gsf:metadata name="wmtb.HapuOrIwi" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Location" select="root"/>
+      <gsf:when test="exists"><br/> Location(s):Â <gsf:metadata name="wmtb.Location" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.DateType" select="root"/>
+      <gsf:when test="exists"><br/><gsf:metadata name="wmtb.DateType" select="root"/>:Â </gsf:when>
       <gsf:otherwise><br/>Date:Â </gsf:otherwise>
     </gsf:switch>
     <gsf:switch>
-      <gsf:metadata name="wmtb.Day"/>
-      <gsf:when test="exists"><gsf:metadata name="wmtb.Day"/>/</gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.Month"/>
-      <gsf:when test="exists"><gsf:metadata name="wmtb.Month"/>/</gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="wmtb.Year"/>
+      <gsf:metadata name="wmtb.Day" select="root"/>
+      <gsf:when test="exists"><gsf:metadata name="wmtb.Day" select="root"/>/</gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Month" select="root"/>
+      <gsf:when test="exists"><gsf:metadata name="wmtb.Month" select="root"/>/</gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="wmtb.Year" select="root"/>
       <gsf:when test="exists">
-        <gsf:metadata name="wmtb.Year"/>
+        <gsf:metadata name="wmtb.Year" select="root"/>
       </gsf:when>
     </gsf:switch>
     <gsf:switch>
-      <gsf:metadata name="wmtb.Type"/>
-      <gsf:when test="exists"><br/> Type:Â <gsf:metadata name="wmtb.Type"/></gsf:when>
-    </gsf:switch>
-    <gsf:switch>
-      <gsf:metadata name="Source"/>
+      <gsf:metadata name="wmtb.Type" select="root"/>
+      <gsf:when test="exists"><br/> Type:Â <gsf:metadata name="wmtb.Type" select="root"/></gsf:when>
+    </gsf:switch>
+    <gsf:switch>
+      <gsf:metadata name="Source" select="root"/>
       <gsf:when test="exists">
         <br/>
-        <i>(<gsf:metadata name="Source"/>)</i>
+        <i>(<gsf:metadata name="Source" select="root"/>)</i>
       </gsf:when>
     </gsf:switch>
@@ -160,5 +159,5 @@
 			<displayItem lang="en" name="name">section</displayItem>
 		</level>
-		<defaultLevel name="document"/>
+		<defaultLevel name="section"/>
 		<index name="allfields">
 			<displayItem lang="en" name="name">all</displayItem>
@@ -204,33 +203,39 @@
 		<searchType name="simpleform"/>
 		<searchType name="advancedform"/>
-		<format>
-			<gsf:template match="documentNode">
-				<gsf:switch>
-					<gsf:metadata name="FileFormat"/>
-					<gsf:when test="equals" test-value="video"/>
-					<gsf:otherwise>
-						<td valign="top">
-							<gsf:link type="document">
-								<gsf:icon type="document"/>
-							</gsf:link>
-						</td>
-					</gsf:otherwise>
-				</gsf:switch>
-				<td valign="top">
-					<gsf:link type="source">
-						<gsf:choose-metadata>
-							<gsf:metadata name="thumbicon"/>
-							<gsf:metadata name="srcicon"/>
-						</gsf:choose-metadata>
-					</gsf:link>
-				</td>
-				<td>
-					<gsf:link type="document">
-						<xsl:call-template name="choose-title"/>
-					</gsf:link>
-					<xsl:call-template name="display-metadata"/>
-				</td>
-			</gsf:template>
-		</format>
+		<format>  <gsf:template match="documentNode">
+    <gsf:switch>
+      <gsf:metadata name="FileFormat"/>
+      <gsf:when test="equals" test-value="video"/>
+      <gsf:otherwise>
+        <td valign="top">
+          <gsf:link type="document">
+            <gsf:icon type="document"/>
+          </gsf:link>
+        </td>
+      </gsf:otherwise>
+    </gsf:switch>
+    <td valign="top">
+      <gsf:link type="source">
+        <gsf:choose-metadata>
+          <gsf:metadata name="thumbicon"/>
+          <gsf:metadata name="srcicon"/>
+        </gsf:choose-metadata>
+      </gsf:link>
+    </td>
+   <td>
+      <gsf:switch>
+        <gsf:metadata name="Title" select="parent"/>
+        <gsf:when test="exists"><gsf:link type="document"><xsl:call-template name="choose-title"/></gsf:link>Â ofÂ <gsf:link select="root" type="document"><gsf:metadata name="wmtb.Title" select="root"/></gsf:link></gsf:when>
+        <gsf:otherwise>
+          <gsf:link type="document">
+            <xsl:call-template name="choose-title"/>
+          </gsf:link>
+        </gsf:otherwise>
+      </gsf:switch>
+      <xsl:call-template name="display-metadata"/>
+    </td>
+  </gsf:template>
+
+</format>
 	</search>
 	<infodb type="jdbm"/>
@@ -380,9 +385,8 @@
 	</browse>
 	<display>
-		<format>
-			<gsf:option name="TOC" value="true"/>
-			<gsf:option name="allowUserComments" value="false"/>
-			<gsf:option name="allowDocumentEditing" value="true"/>
-			<gsf:option name="allowMapGPSEditing" value="true"/>
+		<format>  <gsf:option name="TOC" value="true"/>
+  <gsf:option name="allowUserComments" value="false"/>
+  <gsf:option name="allowDocumentEditing" value="true"/>
+  <gsf:option name="allowMapGPSEditing" value="true"/>
 <!--
 Overwriting this template allows you to change the heading of the document.
@@ -435,5 +439,6 @@
 </gsf:template>
 -->
-		</format>
+
+</format>
 	</display>
 	<replaceListRef id="gs2-standard"/>
@@ -463,3 +468,4 @@
 		</serviceRack>
 	</serviceRackList>
+	<buildOption name="remove_empty_classifications"/>
 </CollectionConfig>
