diff --git a/src/views/install/index.tpl b/src/views/install/index.tpl
index aab7d7e253..5b84d66ee6 100644
--- a/src/views/install/index.tpl
+++ b/src/views/install/index.tpl
@@ -134,18 +134,18 @@
 	</div>
 
 	<div class="hide">
-		<!-- BEGIN databases -->
+		{{{ each databases }}}
 		<div data-database="{databases.name}">
-			<!-- BEGIN questions -->
+			 {{{ each databases.questions }}}
 				<div class="row input-row">
 					<div class="col-sm-7 col-xs-12 input-field">
 						<label for="{databases.questions.name}">{databases.questions.description}</label>
 						<input type="<!-- IF hidden -->password<!-- ELSE -->text<!-- ENDIF hidden -->" class="form-control" name="{databases.questions.name}" placeholder="{databases.questions.default}" value="{databases.questions.default}" />
 					</div>
 				</div>
-			<!-- END questions -->
+			{{{ end }}}
 		</div>
-		<!-- END databases -->
+		{{{ end }}}
 	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/views/sitemap.tpl b/src/views/sitemap.tpl
index e579ed9974..45c6b64ac6 100644
--- a/src/views/sitemap.tpl
+++ b/src/views/sitemap.tpl
@@ -6,9 +6,9 @@
     <sitemap>
         <loc>{url}/sitemap/categories.xml</loc>
     </sitemap>
-    <!-- BEGIN topics -->
+    {{{ each  topics }}}
     <sitemap>
-        <loc>{url}/sitemap/topics.@value.xml</loc>
+        <loc>{url}/sitemap/topics.{@value}.xml</loc>
     </sitemap>
-    <!-- END topics -->
+    {{{ end }}}
 </sitemapindex>
\ No newline at end of file