Template bug fixes and new features.

utils/tests/template/top_searches_css.tmpl

Index: utils/tests/template/top_searches_css.tmpl
diff --git a/utils/tests/template/top_searches_css.tmpl b/utils/tests/template/top_searches_css.tmpl
index ad7a8318d6d4aeb0b9355b02b5e38f84e8f185f7..036145a2b90c53aed8bce2d64fb4115388ce3269 100644
--- a/utils/tests/template/top_searches_css.tmpl
+++ b/utils/tests/template/top_searches_css.tmpl
@@ -19,12 +19,12 @@ template TopSearches(Person person, var searches) {
         <span>${age}</span>
       </div>
       <div>
-        ${#each searches}
-          <div>query=${query},&nbsp;rank=${rank},&nbsp;total=${total}</div>
-          ${#each searches.metrics}
+        ${#each searches search}
+          <div>query=${search.query},&nbsp;rank=${search.rank},&nbsp;total=${search.total}</div>
+          ${#each search.metrics metric}
             <div class="metrics-item">
-              <span>${country}</span>
-              <span class="total-hits">${quantity}</span>
+              <span>${metric.country}</span>
+              <span class="total-hits">${metric.quantity}</span>
             </div>
           ${/each}
         ${/each}