--- trunk/lib/Frey/ObjectBrowser.pm	2008/07/13 12:40:45	107
+++ trunk/lib/Frey/ObjectBrowser.pm	2008/07/13 13:09:56	109
@@ -39,20 +39,10 @@
 	my $f = { $req->params };
 	my $layout = delete( $f->{layout} ) || 'div';
 
-	my $s = $self->fey_class->collection();
-	warn "# s ",$self->fey_class," = ",dump( $s ) if $self->debug;
-
 	my @w;
 
-	while ( my $u = $s->next ) {
-		my $w = Frey::Web::Row->new( fey_class => $self->fey_class, fey => $u, layout => $layout );
-		warn "# w = ",dump( $w ) if $self->debug;
-		push @w, $w;
-	}
-
 	while ( 1 ) {
 	
-		warn "# got $#w elements: ",dump( map { $_->id } @w );
 		warn "<<< GOT REQUEST ",dump( $f );
 
 		# re-apply (changed?) layout to elements
@@ -61,6 +51,21 @@
 			warn "# new layout = $layout\n";
 		}
 
+		if ( ! @w || $f->{limit} || $f->{offset} ) {
+			my $s = $self->fey_class->collection( $f );
+			warn "# s ",$self->fey_class," = ",dump( $s ) if $self->debug;
+
+			@w = ();
+
+			while ( my $u = $s->next ) {
+				my $w = Frey::Web::Row->new( fey_class => $self->fey_class, fey => $u, layout => $layout );
+				warn "# w = ",dump( $w ) if $self->debug;
+				push @w, $w;
+			}
+
+			warn "# got $#w elements: ",dump( map { $_->id } @w );
+		}
+
 		my $rows_delimiter = '';
 		$rows_delimiter = '<hr/>' if $layout eq 'div';