diff --git a/addressbook/inc/class.boaddressbook.inc.php b/addressbook/inc/class.boaddressbook.inc.php
index 3a86528050..a01a211b81 100644
--- a/addressbook/inc/class.boaddressbook.inc.php
+++ b/addressbook/inc/class.boaddressbook.inc.php
@@ -84,7 +84,7 @@
 			/* Might change this to '' at the end---> */
 			$_start   = get_var('start',array('POST','GET'));
 			$_query   = get_var('query',array('POST','GET'));
-			$_cquery  = get_var('cquery',  array('GET'));
+			$_cquery  = get_var('cquery', array('GET','POST'));
 			$_sort    = get_var('sort',array('POST','GET'));
 			$_order   = get_var('order',array('POST','GET'));
 			$_filter  = get_var('filter',array('POST','GET'));
diff --git a/addressbook/inc/class.uiaddressbook.inc.php b/addressbook/inc/class.uiaddressbook.inc.php
index ae79787418..52d90f0bc0 100644
--- a/addressbook/inc/class.uiaddressbook.inc.php
+++ b/addressbook/inc/class.uiaddressbook.inc.php
@@ -310,7 +310,8 @@
 					$cols .= '  <td height="21">' . "\n";
 					$cols .= '    <font size="-1" face="Arial, Helvetica, sans-serif">';
 					$cols .= $GLOBALS['phpgw']->nextmatchs->show_sort_order($this->sort,
-					$column[0],$this->order,'/index.php',$showcol,'&menuaction=addressbook.uiaddressbook.index');
+						$column[0],$this->order,'/index.php',$showcol,'&menuaction=addressbook.uiaddressbook.index'
+					);
 					$cols .= "</font>\n  </td>";
 					$cols .= "\n";
 
@@ -362,8 +363,11 @@
 					$showcol = $this->display_name($col);
 					$cols .= '  <td height="21">' . "\n";
 					$cols .= '    <font size="-1" face="Arial, Helvetica, sans-serif">';
-					$cols .= $GLOBALS['phpgw']->nextmatchs->show_sort_order($this->sort,
-					$col,$this->order,"/index.php",$showcol,'&menuaction=addressbook.uiaddressbook.index&cat_id='.$this->cat_id);
+					$cols .= $GLOBALS['phpgw']->nextmatchs->show_sort_order(
+						$this->sort,$col,$this->order,
+						"/index.php",$showcol,
+						'&menuaction=addressbook.uiaddressbook.index&cat_id=' . $this->cat_id . '&cquery=' . $this->cquery
+					);
 					$cols .= "</font>\n  </td>";
 					$cols .= "\n";
 
@@ -457,9 +461,11 @@
 			$GLOBALS['filter'] = $this->filter;
 
 			$search_filter = $GLOBALS['phpgw']->nextmatchs->show_tpl('/index.php',
-			$this->start, $total_records,'&menuaction=addressbook.uiaddressbook.index&fcat_id='.$this->cat_id,'75%',
-			$GLOBALS['phpgw_info']['theme']['th_bg'],1,1,1,array('filter'=>$this->filter,'yours'=>1),
-			$this->cat_id);
+				$this->start, $total_records,
+				'&menuaction=addressbook.uiaddressbook.index&fcat_id=' . $this->cat_id . '&cquery=' . $this->cquery,'95%',
+				$GLOBALS['phpgw_info']['theme']['th_bg'],1,1,1,array('filter' => $this->filter,'yours' => 1),
+				$this->cat_id
+			);
 			$query = $filter = '';
 
 			$lang_showing = $GLOBALS['phpgw']->nextmatchs->show_hits($total_records,$this->start);