Index: trunk/BookmarkApp.pm
===================================================================
--- trunk/BookmarkApp.pm	(revision 39)
+++ trunk/BookmarkApp.pm	(revision 40)
@@ -83,4 +83,5 @@
             query => {
                 tag => $tags,
+                format => 'text',
             },
         }
Index: trunk/bookmark.tt
===================================================================
--- trunk/bookmark.tt	(revision 39)
+++ trunk/bookmark.tt	(revision 40)
@@ -20,5 +20,5 @@
         <strong>New bookmark:</strong>
       [% END %]
-      <a href="[% uri %]" target="_blank">[% title or uri %]</a>
+      <a href="[% uri | html %]" target="_blank">[% title or uri %]</a>
       [% IF exists %]
         <p class="timestamps">[% created %]</p>
Index: trunk/list.tt
===================================================================
--- trunk/list.tt	(revision 39)
+++ trunk/list.tt	(revision 40)
@@ -102,5 +102,5 @@
 	    (<a href="[% resource.id %]" onclick="window.open(this.href, 'edit_bookmark', 'width=800,height=250').focus(); return false;">Edit</a>)
 	  </span>
-          <a href="[% resource.uri %]" title="[% resource.title | html %] ([% resource.tags.join(', ') %])">[% resource.title or resource.uri %]</a>
+          <a href="[% resource.uri | html %]" title="[% resource.title | html %] ([% resource.tags.join(', ') %])">[% resource.title or resource.uri %]</a>
           <div class="tags">
 	    [% FOREACH tag IN resource.tags %]
@@ -114,5 +114,5 @@
       [% FOREACH link IN links %]
 	<li>
-	  <a href="[% link.href.canonical %]" type="[% link.type %]" rel="[% link.rel %]">[% link.text %]</a>
+	  <a href="[% link.href.canonical | html %]" type="[% link.type %]" rel="[% link.rel %]">[% link.text %]</a>
 	</li>
       [% END %]