Index: trunk/lib/Bookmarks/bookmark.tt
===================================================================
--- trunk/lib/Bookmarks/bookmark.tt	(revision 124)
+++ trunk/lib/Bookmarks/bookmark.tt	(revision 125)
@@ -10,15 +10,15 @@
         <strong>New bookmark:</strong>
       [% END %]
-      <a href="[% bookmark.uri | html %]" target="_blank">[% bookmark.title or bookmark.uri %]</a>
+      <a href="[% bookmark.uri | html %]" target="_blank">[% (bookmark.title or bookmark.uri) | html %]</a>
       </h1>
       [% IF bookmark.exists %]
         <p class="timestamps">
-	  Bookmark created <a href="http://web.archive.org/web/[% bookmark.created_iso %]/[% bookmark.uri %]" title="Nearest Wayback Machine Link" target="_blank">[% bookmark.created %]</a>[% IF bookmark.mtime != bookmark.ctime %]; updated
-	  <a href="http://web.archive.org/web/[% bookmark.updated_iso %]/[% bookmark.uri %]" title="Nearest Wayback Machine Link" target="_blank">[% bookmark.updated %]</a>[% END %]
+	  Bookmark created <a href="http://web.archive.org/web/[% bookmark.created_iso | html %]/[% bookmark.uri | html  %]" title="Nearest Wayback Machine Link" target="_blank">[% bookmark.created | html %]</a>[% IF bookmark.mtime != bookmark.ctime %]; updated
+	  <a href="http://web.archive.org/web/[% bookmark.updated_iso | html %]/[% bookmark.uri | html %]" title="Nearest Wayback Machine Link" target="_blank">[% bookmark.updated | html %]</a>[% END %]
         </p>
         [% IF bookmark.tags.size %]
           <p class="tags">Tagged as:
             [% FOREACH tag IN bookmark.tags %]
-              <a href=".?tag=[% tag %]" class="tag" target="_blank" onclick="if (opener && !opener.closed) { opener.location = this.href; return false; }">[% tag %]</a>
+              <a href=".?tag=[% tag | html %]" class="tag" target="_blank" onclick="if (opener && !opener.closed) { opener.location = this.href; return false; }">[% tag | html %]</a>
             [% END %]
           </p>