--- a/filters.inc	Mon Oct 08 02:01:04 2012 +0200
+++ b/filters.inc	Mon Oct 08 02:02:09 2012 +0200
@@ -29,7 +29,7 @@
   $output = preg_replace_callback($pattern,
 	create_function(
 	  '$matches',
-	  'return "<li id=\"$matches[1]\" $matches[2]><a href=\"" . genUrl(' . $opt . ', array("name" => $matches[1])) . "\">$matches[3]</a></li>";'
+	  'return "<li id=\"$matches[1]\" $matches[2]><a href=\"" . genUrl(' . $opt . ', array("name" => $matches[1]), array("lang") ) . "\">$matches[3]</a></li>";'
 	),
 	$output);
 
@@ -47,7 +47,7 @@
     $langbar.= "
 	    <li class=\"${l}\">";
     if ($active)
-      $langbar .= '<a href="'.genUrl(array( 'lang' => $l)) . '">';
+      $langbar .= '<a href="'.genUrl($options->getUrlParams(), array( 'lang' => $l), array('lang', 'name') ) . '">';
 
     $langbar .= "
 	      <img src=\"http://dev.bfginvest.no/php/flag.php?lang=${l}&amp;active=${active}\" width=\"20\" height=\"16\" alt=\"Norsk versjon - inaktiv\" title=\"Norsk\"/>";