Index: trunk/lib/Bookmarks/Controller.pm
===================================================================
--- trunk/lib/Bookmarks/Controller.pm	(revision 75)
+++ trunk/lib/Bookmarks/Controller.pm	(revision 88)
@@ -7,4 +7,5 @@
 use JSON;
 use Bookmarks;
+use Bookmarks::List;
 use URI;
 use Template;
@@ -83,9 +84,12 @@
     my $offset = $self->request->param('offset');
 
-    my $list = $self->bookmarks->get_bookmarks({
-        query  => $query,
-        tags   => \@tags,
-        limit  => $limit,
-        offset => $offset,
+    my $list = Bookmarks::List->new({
+        bookmarks => $self->bookmarks,
+        search    => $self->bookmarks->search({
+            query  => $query,
+            tags   => \@tags,
+            limit  => $limit,
+            offset => $offset,
+        }),
     });
 
@@ -104,5 +108,8 @@
 
     # construct a feed from the most recent 12 bookmarks
-    my $list = $self->bookmarks->get_bookmarks({ query => $query, tags => \@tags, limit => 12 });
+    my $list = Bookmarks::List->new({
+        bookmarks => $self->bookmarks,
+        search    => $self->bookmarks->search({ query => $query, tags => \@tags, limit => 12 }),
+    });
     return $list->as_atom;
 }
Index: trunk/lib/Bookmarks/List.pm
===================================================================
--- trunk/lib/Bookmarks/List.pm	(revision 75)
+++ trunk/lib/Bookmarks/List.pm	(revision 88)
@@ -13,7 +13,6 @@
     is => 'ro',
     isa => 'Bookmarks::Search',
-    handles => [qw{query tags limit offset}],
+    handles => [qw{query tags limit offset results}],
 );
-has results => ( is => 'ro' );
 has title => (
     is => 'ro',
Index: trunk/lib/Bookmarks/Search.pm
===================================================================
--- trunk/lib/Bookmarks/Search.pm	(revision 75)
+++ trunk/lib/Bookmarks/Search.pm	(revision 88)
@@ -11,4 +11,6 @@
 has offset => (is => 'ro');
 
+has results => (is => 'rw', default => sub { [] });
+
 # module return
 1;