diff --git a/htaccess.sample b/htaccess.sample
index 604326fe88..92edce2f4c 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -1,7 +1,7 @@
 RewriteEngine On
 
-RewriteRule ^$ index.php?action=public [L]
-RewriteRule ^rss$ index.php?action=publicrss [L]
+RewriteRule ^$ index.php?action=public [L,QSA]
+RewriteRule ^rss$ index.php?action=publicrss [L,QSA]
 
 RewriteRule ^doc/about$ index.php?action=doc&title=about [L,QSA]
 RewriteRule ^doc/help$ index.php?action=doc&title=help [L,QSA]
diff --git a/lib/util.php b/lib/util.php
index 1c6bbaf16a..169a23853c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -760,7 +760,7 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
 										 
 		common_element_start('li', 'before');
 		common_element('a', array('href' => common_local_url($action, $newargs)),
-					   _t('« Before'));
+					   _t('« After'));
 		common_element_end('li');
 	}
 
@@ -769,7 +769,7 @@ function common_pagination($have_before, $have_after, $page, $action, $args=NULL
 		$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
 		common_element_start('li', 'after');
 		common_element('a', array('href' => common_local_url($action, $newargs)),
-						   _t('After »'));
+						   _t('Before »'));
 		common_element_end('li');
 	}