Index: trunk/BookmarkApp.pm
===================================================================
--- trunk/BookmarkApp.pm	(revision 31)
+++ trunk/BookmarkApp.pm	(revision 32)
@@ -216,9 +216,21 @@
     my $feed = XML::Atom::Feed->new;
     $feed->title($title);
-    $feed->id($base_uri->canonical . 'feed');
+
+    my $feed_uri = URI->new_abs('feed', $base_uri);
+    $feed_uri->query_form(tag => \@tags);
+    $feed->id($feed_uri->canonical);
+
+    my $self_link = XML::Atom::Link->new;
+    $self_link->type('application/atom+xml');
+    $self_link->rel('self');
+    $self_link->href($feed_uri->canonical);
+    $feed->add_link($self_link);
+
     my $html_link = XML::Atom::Link->new;
     $html_link->type('text/html');
     $html_link->rel('alternate');
-    $html_link->href($base_uri->canonical);
+    my $html_uri = $base_uri->clone;
+    $html_uri->query_form(tag => \@tags);
+    $html_link->href($html_uri->canonical);
     $feed->add_link($html_link);