diff --git a/interface/lib/classes/listform.inc.php b/interface/lib/classes/listform.inc.php
index 96ab4a360a9f37a0beea2bebdd2f23255e46d476..b17eb0edcb85b10500b278814f0c19b475bb6799 100644
--- a/interface/lib/classes/listform.inc.php
+++ b/interface/lib/classes/listform.inc.php
@@ -191,11 +191,16 @@ class listform {
     public function getPagingSQL($sql_where = '1') 
     {
         global $app, $conf;
+        
+        //* Add Global Limit from selectbox
+        if(!empty($_POST['search_limit']) AND intval($_POST['search_limit'])){
+	  $_SESSION['search']['limit'] = $_POST['search_limit'];
+	}
 
         //* Get Config variables
         $list_name          = $this->listDef['name'];
         $search_prefix      = $this->listDef['search_prefix'];
-        $records_per_page   = $this->listDef['records_per_page'];
+        $records_per_page   = (empty($_SESSION['search']['limit']) ? $this->listDef['records_per_page'] : $_SESSION['search']['limit']) ;
         $table              = $this->listDef['table'];
 
         //* set PAGE to zero, if in session not set
diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php
index a35aca9257c2fddd7305983edf3568d92a69ee7d..9b9fe843a84e095502a1aef5e47249ab39b52f03 100644
--- a/interface/lib/classes/listform_actions.inc.php
+++ b/interface/lib/classes/listform_actions.inc.php
@@ -55,7 +55,34 @@ class listform_actions {
 		
 		$app->tpl->newTemplate("listpage.tpl.htm");
 		$app->tpl->setInclude('content_tpl','templates/'.$app->listform->listDef["name"].'_list.htm');
+		
+		//* Manipulate order by for sorting / Every list has a stored value
+		//* Against notice error
+		if(!isset($_SESSION['search'][$app->listform->listDef["name"]]['order'])){
+		  $_SESSION['search'][$app->listform->listDef["name"]]['order'] = '';
+		}
+
+		if(!empty($_GET['orderby'])){
+		  $order = str_replace('tbl_col_','',$_GET['orderby']);
+		  //* Check the css class submited value
+		  if (preg_match("/^[a-z\_]{1,}$/",$order)) {
+		    if($_SESSION['search'][$app->listform->listDef["name"]]['order'] == $order){
+		      $_SESSION['search'][$app->listform->listDef["name"]]['order'] = $order.' DESC';
+		    } else {
+		      $_SESSION['search'][$app->listform->listDef["name"]]['order'] = $order;
+		    }
+		  }
+		}
 
+		// If a manuel oder by like customers isset the sorting will be infront
+		if(!empty($_SESSION['search'][$app->listform->listDef["name"]]['order'])){
+		  if(empty($this->SQLOrderBy)){
+		    $this->SQLOrderBy = "ORDER BY ".$_SESSION['search'][$app->listform->listDef["name"]]['order'];
+		  } else {
+		    $this->SQLOrderBy = str_replace("ORDER BY ","ORDER BY ".$_SESSION['search'][$app->listform->listDef["name"]]['order'].', ',$this->SQLOrderBy);
+		  }
+		}
+		
 		// Getting Datasets from DB
 		$records = $app->db->queryAllRecords($this->getQueryString());
 
@@ -130,7 +157,99 @@ class listform_actions {
 		$limit_sql = $app->listform->getPagingSQL($sql_where);
 		$app->tpl->setVar('paging',$app->listform->pagingHTML);
 
-		return 'SELECT * FROM '.$app->listform->listDef['table']." WHERE $sql_where $order_by_sql $limit_sql";
+		$extselect = '';
+		$join = '';
+		if(!empty($_SESSION['search'][$app->listform->listDef["name"]]['order'])){
+		  $order = str_replace(' DESC','',$_SESSION['search'][$app->listform->listDef["name"]]['order']);
+		  if($order == 'server_id' && $app->listform->listDef['table'] != 'server'){
+		    $join .= ' LEFT JOIN server as s ON '.$app->listform->listDef['table'].'.server_id = s.server_id ';
+		    $order_by_sql = str_replace('server_id','server_name',$order_by_sql);
+		  } elseif($order == 'client_id' && $app->listform->listDef['table'] != 'client'){
+		    $join .= ' LEFT JOIN client as c ON '.$app->listform->listDef['table'].'.client_id = c.client_id ';
+		    $order_by_sql = str_replace('client_id','contact_name',$order_by_sql);
+		  } elseif($order == 'parent_domain_id'){
+		    $join .= ' LEFT JOIN web_domain as wd ON '.$app->listform->listDef['table'].'.parent_domain_id = wd.domain_id ';
+		    $order_by_sql = str_replace('parent_domain_id','wd.domain',$order_by_sql);
+		    $sql_where = str_replace('type',$app->listform->listDef['table'].'.type',$sql_where);
+		  } elseif($order == 'sys_groupid'){
+		    $join .= ' LEFT JOIN sys_group as sg ON '.$app->listform->listDef['table'].'.sys_groupid = sg.groupid ';
+		    $order_by_sql = str_replace('sys_groupid','name',$order_by_sql);
+		  } elseif($order == 'rid'){
+		    $join .= ' LEFT JOIN spamfilter_users as su ON '.$app->listform->listDef['table'].'.rid = su.id ';
+		    $order_by_sql = str_replace('rid','email',$order_by_sql);
+		  } elseif($order == 'policy_id'){
+		    $join .= ' LEFT JOIN spamfilter_policy as sp ON '.$app->listform->listDef['table'].'.policy_id = sp.id ';
+		    $order_by_sql = str_replace('policy_id','policy_name',$order_by_sql);
+		  } elseif($order == 'web_folder_id'){
+		    $join .= ' LEFT JOIN web_folder as wf ON '.$app->listform->listDef['table'].'.web_folder_id = wf.web_folder_id ';
+		    $order_by_sql = str_replace('web_folder_id','path',$order_by_sql);
+		  } elseif($order == 'ostemplate_id' && $app->listform->listDef['table'] != 'openvz_ostemplate'){
+		    $join .= ' LEFT JOIN openvz_ostemplate as oo ON '.$app->listform->listDef['table'].'.ostemplate_id = oo.ostemplate_id ';
+		    $order_by_sql = str_replace('ostemplate_id','template_name',$order_by_sql);
+		  } elseif($order == 'template_id' && $app->listform->listDef['table'] != 'openvz_template'){
+		    $join .= ' LEFT JOIN openvz_template as ot ON '.$app->listform->listDef['table'].'.template_id = ot.template_id ';
+		    $order_by_sql = str_replace('template_id','template_name',$order_by_sql);
+		  } elseif($order == 'sender_id' && $app->listform->listDef['table'] != 'sys_user'){
+		    $join .= ' LEFT JOIN sys_user as su ON '.$app->listform->listDef['table'].'.sender_id = su.userid ';
+		    $order_by_sql = str_replace('sender_id','username',$order_by_sql);
+		  } elseif($order == 'web_traffic_last_month'){
+		    $tmp_year = date('Y',mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
+		    $tmp_month = date('m',mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
+		    $extselect .= ', SUM(wt.traffic_bytes) as calctraffic';
+		    $join .= ' JOIN web_traffic as wt ON '.$app->listform->listDef['table'].'.domain = wt.hostname ';
+		    $sql_where .= " AND YEAR(wt.traffic_date) = '$tmp_year' AND MONTH(wt.traffic_date) = '$tmp_month'";
+		    $order_by_sql = str_replace('web_traffic_last_month','calctraffic',$order_by_sql);
+		    $order_by_sql = "GROUP BY domain ".$order_by_sql;
+		  } elseif($order == 'web_traffic_this_month'){
+		    $tmp_year = date('Y');
+		    $tmp_month = date('m');
+		    $extselect .= ', SUM(wt.traffic_bytes) as calctraffic';
+		    $join .= ' JOIN web_traffic as wt ON '.$app->listform->listDef['table'].'.domain = wt.hostname ';
+		    $sql_where .= " AND YEAR(wt.traffic_date) = '$tmp_year' AND MONTH(wt.traffic_date) = '$tmp_month'";
+		    $order_by_sql = str_replace('web_traffic_this_month','calctraffic',$order_by_sql);
+		    $order_by_sql = "GROUP BY domain ".$order_by_sql;
+		  } elseif($order == 'web_traffic_last_year'){
+		    $tmp_year = date('Y',mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
+		    $extselect .= ', SUM(wt.traffic_bytes) as calctraffic';
+		    $join .= ' JOIN web_traffic as wt ON '.$app->listform->listDef['table'].'.domain = wt.hostname ';
+		    $sql_where .= " AND YEAR(wt.traffic_date) = '$tmp_year'";
+		    $order_by_sql = str_replace('web_traffic_last_year','calctraffic',$order_by_sql);
+		    $order_by_sql = "GROUP BY domain ".$order_by_sql;
+		  } elseif($order == 'web_traffic_this_year'){
+		    $tmp_year = date('Y');
+		    $extselect .= ', SUM(wt.traffic_bytes) as calctraffic';
+		    $join .= ' JOIN web_traffic as wt ON '.$app->listform->listDef['table'].'.domain = wt.hostname ';
+		    $sql_where .= " AND YEAR(wt.traffic_date) = '$tmp_year'";
+		    $order_by_sql = str_replace('web_traffic_this_year','calctraffic',$order_by_sql);
+		    $order_by_sql = "GROUP BY domain ".$order_by_sql;
+		  } elseif($order == 'mail_traffic_last_month'){
+		    $tmp_date = date('Y-m',mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
+		    $join .= ' JOIN mail_traffic as mt ON '.$app->listform->listDef['table'].'.mailuser_id = mt.mailuser_id ';
+		    $sql_where .= " AND mt.month like '$tmp_date%'";
+		    $order_by_sql = str_replace('mail_traffic_last_month','traffic',$order_by_sql);
+		  } elseif($order == 'mail_traffic_this_month'){
+		    $tmp_date = date('Y-m');
+		    $join .= ' JOIN mail_traffic as mt ON '.$app->listform->listDef['table'].'.mailuser_id = mt.mailuser_id ';
+		    $sql_where .= " AND mt.month like '$tmp_date%'";
+		    $order_by_sql = str_replace('mail_traffic_this_month','traffic',$order_by_sql);
+		  } elseif($order == 'mail_traffic_last_year'){
+		    $tmp_date = date('Y',mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
+		    $extselect .= ', SUM(mt.traffic) as calctraffic';
+		    $join .= ' JOIN mail_traffic as mt ON '.$app->listform->listDef['table'].'.mailuser_id = mt.mailuser_id ';
+		    $sql_where .= " AND mt.month like '$tmp_date%'";;
+		    $order_by_sql = str_replace('mail_traffic_last_year','calctraffic',$order_by_sql);
+		    $order_by_sql = "GROUP BY mailuser_id ".$order_by_sql;
+		  } elseif($order == 'mail_traffic_this_year'){
+		    $tmp_date = date('Y');
+		    $extselect .= ', SUM(mt.traffic) as calctraffic';
+		    $join .= ' JOIN mail_traffic as mt ON '.$app->listform->listDef['table'].'.mailuser_id = mt.mailuser_id ';
+		    $sql_where .= " AND mt.month like '$tmp_date%'";
+		    $order_by_sql = str_replace('mail_traffic_this_year','calctraffic',$order_by_sql);
+		    $order_by_sql = "GROUP BY mailuser_id ".$order_by_sql;
+		  }
+		}
+
+		return 'SELECT '.$app->listform->listDef['table'].'.*'.$extselect.' FROM '.$app->listform->listDef['table']."$join WHERE $sql_where $order_by_sql $limit_sql";
 	}
 	
 	
@@ -145,6 +264,15 @@ class listform_actions {
 		include($lng_file);
 		$app->tpl->setVar($wb);
 		
+		//* Limit each page
+		$limits = array('5'=>'5','15'=>'15','25'=>'25','50'=>'50','100'=>'100','999999999' => 'all');
+
+		//* create options and set selected, if default -> 15 is selected
+		foreach($limits as $key => $val){
+		  $options .= '<option value="'.$key.'" '.(isset($_SESSION['search']['limit']) &&  $_SESSION['search']['limit'] == $key ? 'selected="selected"':'' ).(!isset($_SESSION['search']['limit']) && $key == '15' ? 'selected="selected"':'').'>'.$val.'</option>';
+		}
+		$app->tpl->setVar('search_limit','<select name="search_limit" style="width:50px">'.$options.'</select>');
+		
 		$app->tpl->setVar('toolsarea_head_txt',$app->lng('toolsarea_head_txt'));
 		$app->tpl->setVar($app->listform->wordbook);
 		$app->tpl->setVar('form_action', $app->listform->listDef['file']);
diff --git a/interface/lib/classes/plugin_listview.inc.php b/interface/lib/classes/plugin_listview.inc.php
index e543e25636b69acce8f467fe17d479f26dd4ce63..036b1155e226d5ff1f5e7f9aed012cd179c1ae26 100644
--- a/interface/lib/classes/plugin_listview.inc.php
+++ b/interface/lib/classes/plugin_listview.inc.php
@@ -82,7 +82,43 @@ class plugin_listview extends plugin_base {
 				if(isset($this->options["sql_order_by"])) {
 					$sql_order_by = $this->options["sql_order_by"];
 				}
-				
+
+		//* Limit each page
+		$limits = array('5'=>'5','15'=>'15','25'=>'25','50'=>'50','100'=>'100','999999999' => 'all');
+
+		//* create options and set selected, if default -> 15 is selected
+		foreach($limits as $key => $val){
+		  $options .= '<option value="'.$key.'" '.(isset($_SESSION['search']['limit']) &&  $_SESSION['search']['limit'] == $key ? 'selected="selected"':'' ).(!isset($_SESSION['search']['limit']) && $key == '15' ? 'selected="selected"':'').'>'.$val.'</option>';
+		}
+		$listTpl->setVar('search_limit','<select name="search_limit" style="width:50px">'.$options.'</select>');
+
+
+		//Sorting
+		if(!isset($_SESSION['search'][$app->listform->listDef["name"]]['order'])){
+		  $_SESSION['search'][$app->listform->listDef["name"]]['order'] = '';
+		}
+
+		if(!empty($_GET['orderby'])){
+		  $order = str_replace('tbl_col_','',$_GET['orderby']);
+		  //* Check the css class submited value
+		  if (preg_match("/^[a-z\_]{1,}$/",$order)) {
+		    if($_SESSION['search'][$app->listform->listDef["name"]]['order'] == $order){
+		      $_SESSION['search'][$app->listform->listDef["name"]]['order'] = $order.' DESC';
+		    } else {
+		      $_SESSION['search'][$app->listform->listDef["name"]]['order'] = $order;
+		    }
+		  }
+		}
+
+		// If a manuel oder by like customers isset the sorting will be infront
+		if(!empty($_SESSION['search'][$app->listform->listDef["name"]]['order'])){
+		  if(empty($sql_order_by)){
+		    $sql_order_by = "ORDER BY ".$_SESSION['search'][$app->listform->listDef["name"]]['order'];
+		  } else {
+		    $sql_order_by = str_replace("ORDER BY ","ORDER BY ".$_SESSION['search'][$app->listform->listDef["name"]]['order'].', ',$sql_order_by);
+		  }
+		}
+		
 				// Loading language field
                 $lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$app->listform->listDef['name']."_list.lng";
                 include($lng_file);
diff --git a/interface/web/admin/templates/firewall_list.htm b/interface/web/admin/templates/firewall_list.htm
index da6df90a6050b0417c6cac9f37490dc5530db877..9b0d0356302f8586965276b3c2175189bd569631 100644
--- a/interface/web/admin/templates/firewall_list.htm
+++ b/interface/web/admin/templates/firewall_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_tcp_port" scope="col"><tmpl_var name="tcp_port_txt"></th>
             <th class="tbl_col_udp_port" scope="col"><tmpl_var name="udp_port_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/admin/templates/remote_user_list.htm b/interface/web/admin/templates/remote_user_list.htm
index 7f89f3213f256f79394283121a3fbbbe60326fa0..b55e16d3c69e4212eebefd6ce0083a537a2b1492 100644
--- a/interface/web/admin/templates/remote_user_list.htm
+++ b/interface/web/admin/templates/remote_user_list.htm
@@ -16,12 +16,12 @@
         <thead>
           <tr>
             <th class="tbl_col_remote_userid" scope="col"><tmpl_var name="parent_remote_userid_txt"></th>
-            <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="tbl_col_remote_username" scope="col"><tmpl_var name="username_txt"></th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_remote_userid"></td>           
- 	    <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
+ 	    <td class="tbl_col_remote_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
             <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','admin/remote_user_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
           </tr>
         </thead>
@@ -29,7 +29,7 @@
           <tmpl_loop name="records">
           <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
             <td class="tbl_col_remote_userid"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_userid"}</a></td>
-            <td class="tbl_col_username"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_username"}</a></td>
+            <td class="tbl_col_remote_username"><a href="#" onClick="loadContent('admin/remote_user_edit.php?id={tmpl_var name='remote_userid'}');">{tmpl_var name="remote_username"}</a></td>
             <td class="tbl_col_buttons">
               <div class="buttons icons16">    
                 <a class="icons16 icoDelete" href="javascript: del_record('admin/remote_user_del.php?id={tmpl_var name='remote_userid'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a>
diff --git a/interface/web/admin/templates/server_config_list.htm b/interface/web/admin/templates/server_config_list.htm
index f635cad7ea8728b357cb242b0d968f25beabe2fb..87818f948d70fef8fc01dfbadfcd724a9ec0fed2 100644
--- a/interface/web/admin/templates/server_config_list.htm
+++ b/interface/web/admin/templates/server_config_list.htm
@@ -9,7 +9,7 @@
         <thead>
           <tr>
             <th class="tbl_col_server_name" scope="col"><tmpl_var name="server_name_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
diff --git a/interface/web/admin/templates/server_ip_list.htm b/interface/web/admin/templates/server_ip_list.htm
index 6c41f958f0a253a9ccec0d76cd1edd849b508b35..db3d2d94c53da68585280df3334e8a2ceb30f356 100644
--- a/interface/web/admin/templates/server_ip_list.htm
+++ b/interface/web/admin/templates/server_ip_list.htm
@@ -23,7 +23,7 @@
             <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
             <th class="tbl_col_virtualhost" scope="col"><tmpl_var name="virtualhost_txt"></th>
             <th class="tbl_col_virtualhost_port" scope="col"><tmpl_var name="virtualhost_port_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
diff --git a/interface/web/admin/templates/server_list.htm b/interface/web/admin/templates/server_list.htm
index 2bb0691ba3dcdd0fb76df4b9b3ea2e0cb7bc220e..1cdcf0dc2010902a06515b0122d0dd063221c53a 100644
--- a/interface/web/admin/templates/server_list.htm
+++ b/interface/web/admin/templates/server_list.htm
@@ -15,7 +15,7 @@
             <th class="tbl_col_file_server" scope="col"><tmpl_var name="file_server_txt"></th>
             <th class="tbl_col_db_server" scope="col"><tmpl_var name="db_server_txt"></th>
             <th class="tbl_col_vserver_server" scope="col"><tmpl_var name="vserver_server_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_server_name"><input type="text" name="search_server_name" value="{tmpl_var name='search_server_name'}" /></td>
diff --git a/interface/web/admin/templates/users_list.htm b/interface/web/admin/templates/users_list.htm
index 1ec611e4ff1e35a2da034be49b72b7ae8d975b91..0affa7e24fdafe9f7861fc2491ecd7eee4dbc233 100644
--- a/interface/web/admin/templates/users_list.htm
+++ b/interface/web/admin/templates/users_list.htm
@@ -20,10 +20,10 @@
         <thead>
           <tr>
             <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
-            <th class="tbl_col_vorname" scope="col"><tmpl_var name="vorname_txt"></th>
-            <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
-            <th class="tbl_col_ort" scope="col"><tmpl_var name="ort_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col"><tmpl_var name="vorname_txt"></th>
+            <th class="" scope="col"><tmpl_var name="name_txt"></th>
+            <th class="" scope="col"><tmpl_var name="ort_txt"></th>
+            <th scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td>
diff --git a/interface/web/client/list/client_template.list.php b/interface/web/client/list/client_template.list.php
index c3d2bff88eb47ab5376fd1af56a4a440925e42cf..ef348e37122937b0de87f13b518363dd826be0f9 100644
--- a/interface/web/client/list/client_template.list.php
+++ b/interface/web/client/list/client_template.list.php
@@ -45,6 +45,16 @@ $liste["auth"]				= "yes";
 * Suchfelder
 *****************************************************/
 
+$liste["item"][] = array(	'field'		=> "template_id",
+							'datatype'	=> "INTEGER",
+							'formtype'	=> "TEXT",
+							'op'		=> "=",
+							'prefix'	=> "",
+							'suffix'	=> "",
+							'width'		=> "",
+							'value'		=> "");
+
+
 $liste["item"][] = array(	'field'		=> "template_type",
 							'datatype'	=> "VARCHAR",
 							'formtype'	=> "SELECT",
diff --git a/interface/web/client/templates/client_template_list.htm b/interface/web/client/templates/client_template_list.htm
index c88ee74614850a9884206d70cee73d0350054826..665f6efdac8f39f3cd92dade70ac1568ec18c7bf 100644
--- a/interface/web/client/templates/client_template_list.htm
+++ b/interface/web/client/templates/client_template_list.htm
@@ -18,12 +18,14 @@
       <table class="list">
         <thead>
           <tr>
+	    <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
             <th class="tbl_col_template_type" scope="col"><tmpl_var name="template_type_txt"></th>
             <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
-            <th class="tbl_col_last" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
-			<td class="tbl_col_template_type"><select name="search_template_type">{tmpl_var name='search_template_type'}</select></td>
+	    <td class="tbl_col_template_id"><input type="text" name="search_template_id" value="{tmpl_var name='search_template_id'}" style="width:30px;" /></td>
+	    <td class="tbl_col_template_type"><select name="search_template_type">{tmpl_var name='search_template_type'}</select></td>
             <td class="tbl_col_template_name"><input type="text" name="search_template_name" value="{tmpl_var name='search_template_name'}" /></td>
             <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','client/client_template_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
           </tr>
@@ -31,6 +33,7 @@
         <tbody>
           <tmpl_loop name="records">
           <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
+	    <td class="tbl_col_template_id"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_id"}</a></td>
             <td class="tbl_col_template_type"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_type"}</a></td>
             <td class="tbl_col_template_name"><a href="#" onClick="loadContent('client/client_template_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="template_name"}</a></td>
             <td class="tbl_col_buttons">
@@ -43,7 +46,7 @@
         </tbody>
         <tfoot>
           <tr>
-            <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td>
+            <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td>
           </tr>
         </tfoot>
       </table>
diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm
index d521726e6656adb0eb86dbddba9268db09cb51fe..820b11da772aa97546c749e378b574bdac532c73 100644
--- a/interface/web/client/templates/clients_list.htm
+++ b/interface/web/client/templates/clients_list.htm
@@ -24,7 +24,7 @@
             <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
             <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
             <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
-            <th class="tbl_col_country" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm
index 752ebf5d32949be3678192f8b8c040ef7fc86e76..54e4aae5a4d43630975aa5808975d4818a6fd1c2 100644
--- a/interface/web/client/templates/resellers_list.htm
+++ b/interface/web/client/templates/resellers_list.htm
@@ -23,7 +23,7 @@
             <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th>
             <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th>
             <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th>
-            <th class="tbl_col_country" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_client_id"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" style="width:30px;" /></td>
diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm
index 44009bbe6c42656bb1a9c7bd084341c7c97800d8..643cf9175dbe48c1169e8fea1103d82739765bf3 100644
--- a/interface/web/dns/templates/dns_a_list.htm
+++ b/interface/web/dns/templates/dns_a_list.htm
@@ -48,7 +48,7 @@
             <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
             <th class="tbl_col_data" scope="col"><tmpl_var name="data_txt"></th>
             <th class="tbl_col_aux" scope="col"><tmpl_var name="aux_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/dns/templates/dns_slave_list.htm b/interface/web/dns/templates/dns_slave_list.htm
index 4790a34e7eec94a87feae88377b3eefe131ad203..351eb4bd37d627f423f799fb250c59b094e79953 100644
--- a/interface/web/dns/templates/dns_slave_list.htm
+++ b/interface/web/dns/templates/dns_slave_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
             <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/dns/templates/dns_soa_list.htm b/interface/web/dns/templates/dns_soa_list.htm
index 658b3740852eb60a049d5cba8caab92afb557bd7..025304206c5b0c28c87579b369554a093275c77a 100644
--- a/interface/web/dns/templates/dns_soa_list.htm
+++ b/interface/web/dns/templates/dns_soa_list.htm
@@ -29,7 +29,7 @@
             <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th>
             <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th>
             <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/dns/templates/dns_template_list.htm b/interface/web/dns/templates/dns_template_list.htm
index dbaa853fd64a1c3ad9b4a72e7e075373f2bfda58..32be2f1f902e11c6603e6aeec6550d394dbf8af2 100644
--- a/interface/web/dns/templates/dns_template_list.htm
+++ b/interface/web/dns/templates/dns_template_list.htm
@@ -20,7 +20,7 @@
           <tr>
             <th class="tbl_col_visible" scope="col"><tmpl_var name="visible_txt"></th>
             <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_visible"><select name="search_visible">{tmpl_var name='search_visible'}</select></td>
diff --git a/interface/web/domain/templates/domain_list.htm b/interface/web/domain/templates/domain_list.htm
index 4fd8e1e978ec8de8d60e1d88aeb99baf06a04aa2..bfb354468eb45fa1965e95b92e1574cb5004d08c 100644
--- a/interface/web/domain/templates/domain_list.htm
+++ b/interface/web/domain/templates/domain_list.htm
@@ -25,8 +25,8 @@
         <thead>
           <tr>
             <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_domain" scope="col"><tmpl_var name="user_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="user_txt">A</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
diff --git a/interface/web/help/templates/support_message_list.htm b/interface/web/help/templates/support_message_list.htm
index 255d120b119fda94ac3899c6a4353206308f1c88..e6be33d22e38fbe1d5a347664ab1c857f88530c3 100644
--- a/interface/web/help/templates/support_message_list.htm
+++ b/interface/web/help/templates/support_message_list.htm
@@ -20,7 +20,7 @@
           <tr>
             <th class="tbl_col_sender_id" scope="col"><tmpl_var name="sender_id_txt"></th>
             <th class="tbl_col_subject" scope="col"><tmpl_var name="subject_txt"></th>
-            <th class="tbl_col_subject" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_sender_id"><select name="search_sender_id">{tmpl_var name='search_sender_id'}</select></td>
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm
index 8468f1a3183faaf2a3d02b658d7ce851017390e1..e22c571841d7027ed819a3b5dfc8f75bfebed5f8 100644
--- a/interface/web/mail/templates/mail_alias_list.htm
+++ b/interface/web/mail/templates/mail_alias_list.htm
@@ -21,7 +21,7 @@
             <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
             <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
             <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/mail_aliasdomain_list.htm b/interface/web/mail/templates/mail_aliasdomain_list.htm
index 0fb3c86843fc9a384ca08089995e75da91bc82c8..90f5a77e28a8c5ef9bf1d12974c0850993ec1b3d 100644
--- a/interface/web/mail/templates/mail_aliasdomain_list.htm
+++ b/interface/web/mail/templates/mail_aliasdomain_list.htm
@@ -21,7 +21,7 @@
             <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
             <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
             <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/mail_blacklist_list.htm b/interface/web/mail/templates/mail_blacklist_list.htm
index 92f0447b982630dd0a3bddf7fadc5ba4d516cd76..8ebc3338f44b0b7b6dc0cdf88b9661e498fd3b3c 100644
--- a/interface/web/mail/templates/mail_blacklist_list.htm
+++ b/interface/web/mail/templates/mail_blacklist_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
             <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/mail_content_filter_list.htm b/interface/web/mail/templates/mail_content_filter_list.htm
index e001f487a4db852229259c592f4c31c591725c10..82625e523c68cdfb71caf92d75497a16b981422a 100644
--- a/interface/web/mail/templates/mail_content_filter_list.htm
+++ b/interface/web/mail/templates/mail_content_filter_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_pattern" scope="col"><tmpl_var name="pattern_txt"></th>
             <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/mail_domain_admin_list.htm b/interface/web/mail/templates/mail_domain_admin_list.htm
index f52ac5ff2278716bcfaa617f85020cadd0f31a3e..04de53f8608575362467b6c1745bbbea7729cc9b 100644
--- a/interface/web/mail/templates/mail_domain_admin_list.htm
+++ b/interface/web/mail/templates/mail_domain_admin_list.htm
@@ -21,7 +21,7 @@
             <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/mail_domain_catchall_list.htm b/interface/web/mail/templates/mail_domain_catchall_list.htm
index 2b1be9f1db0c7b61f7dc0f695d184cbbc9f82e50..1c49b9555c8959080de8cacfb68c09d9b777ef90 100644
--- a/interface/web/mail/templates/mail_domain_catchall_list.htm
+++ b/interface/web/mail/templates/mail_domain_catchall_list.htm
@@ -21,7 +21,7 @@
             <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
             <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
             <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/mail_domain_list.htm b/interface/web/mail/templates/mail_domain_list.htm
index d655a340122bfa6951cfd13fb9b460419d0c564b..428485362b9c77e63dbd81b42c909d145f317725 100644
--- a/interface/web/mail/templates/mail_domain_list.htm
+++ b/interface/web/mail/templates/mail_domain_list.htm
@@ -21,7 +21,7 @@
             <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/mail_forward_list.htm b/interface/web/mail/templates/mail_forward_list.htm
index 5e5cf2c5b946560e9cba4d6b9f4a27a3b1f5db56..eb418bf87a603b441e9b43c8e2b4d5fdf7413e5b 100644
--- a/interface/web/mail/templates/mail_forward_list.htm
+++ b/interface/web/mail/templates/mail_forward_list.htm
@@ -21,7 +21,7 @@
             <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
             <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
             <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/mail_get_list.htm b/interface/web/mail/templates/mail_get_list.htm
index cc095460483b88aa460183eea712c4c665283221..7c55eae4ca5c7dca2a926c987dddc06e21d3a4f4 100644
--- a/interface/web/mail/templates/mail_get_list.htm
+++ b/interface/web/mail/templates/mail_get_list.htm
@@ -23,7 +23,7 @@
             <th class="tbl_col_source_server" scope="col"><tmpl_var name="source_server_txt"></th>
             <th class="tbl_col_source_username" scope="col"><tmpl_var name="source_username_txt"></th>
             <th class="tbl_col_destination" scope="col"><tmpl_var name="destination_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/mail_mailinglist_list.htm b/interface/web/mail/templates/mail_mailinglist_list.htm
index 37b0be7c8be130db4db4a647ae7763d357d4d62e..44739b34c1251dcb32210d1b1ad21b40f7c7e7d4 100644
--- a/interface/web/mail/templates/mail_mailinglist_list.htm
+++ b/interface/web/mail/templates/mail_mailinglist_list.htm
@@ -19,7 +19,7 @@
           <tr>
             <th class="tbl_col_listname" scope="col"><tmpl_var name="listname_txt"></th>
             <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_listname"><input type="text" name="search_listname" value="{tmpl_var name='search_listname'}" /></td>
diff --git a/interface/web/mail/templates/mail_relay_recipient_list.htm b/interface/web/mail/templates/mail_relay_recipient_list.htm
index 8f66b5186c14c72ceb03d97609dfec7ea79bab0c..fc9fb7310d2c797c954ec9e8cb38c17c37b3a088 100644
--- a/interface/web/mail/templates/mail_relay_recipient_list.htm
+++ b/interface/web/mail/templates/mail_relay_recipient_list.htm
@@ -20,7 +20,7 @@
             <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/mail_transport_list.htm b/interface/web/mail/templates/mail_transport_list.htm
index df82002c364a833ebbbde4ce9d23f3bfd3df58e0..0cd0c5b9aa8d7237ad8257267b700ed7fd4801c9 100644
--- a/interface/web/mail/templates/mail_transport_list.htm
+++ b/interface/web/mail/templates/mail_transport_list.htm
@@ -23,7 +23,7 @@
             <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
             <th class="tbl_col_transport" scope="col"><tmpl_var name="transport_txt"></th>
             <th class="tbl_col_sort_order" scope="col"><tmpl_var name="sort_order_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/mail_user_filter_list.htm b/interface/web/mail/templates/mail_user_filter_list.htm
index be85427d96978f10c01cee73d3e4575c1a51bd6a..a063e7a8ac30c5e991094dea94270e27d0b2a21d 100644
--- a/interface/web/mail/templates/mail_user_filter_list.htm
+++ b/interface/web/mail/templates/mail_user_filter_list.htm
@@ -15,11 +15,11 @@
         <thead>
           <tr>
             <th class="tbl_col_rulename" scope="col"><tmpl_var name="rulename_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="tbl_col_buttons" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_rulename"><input type="text" name="search_rulename" value="{tmpl_var name='search_rulename'}" /></td>
-            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
+            <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="changeTab('filter_records','mail/mail_user_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td>
           </tr>
         </thead>
         <tbody>
diff --git a/interface/web/mail/templates/mail_user_list.htm b/interface/web/mail/templates/mail_user_list.htm
index a0fe815977207b8de9cccdb1a9c34b2c9b2b9f9d..9df3d200a79f5bae6684dad147bac28497222e82 100644
--- a/interface/web/mail/templates/mail_user_list.htm
+++ b/interface/web/mail/templates/mail_user_list.htm
@@ -22,7 +22,7 @@
       <tmpl_if name="enable_custom_login"><th class="tbl_col_login" scope="col"><tmpl_var name="login_txt"></th></tmpl_if>
       <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
             <th class="tbl_col_autoresponder" scope="col"><tmpl_var name="autoresponder_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
diff --git a/interface/web/mail/templates/mail_user_stats_list.htm b/interface/web/mail/templates/mail_user_stats_list.htm
index b7f0d28ae5aba36379cd797b375cd48717fe278a..4a334473c7623d6ea795fc30121c78a46e6c27ef 100644
--- a/interface/web/mail/templates/mail_user_stats_list.htm
+++ b/interface/web/mail/templates/mail_user_stats_list.htm
@@ -9,11 +9,11 @@
         <thead>
           <tr>
             <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
-            <th class="tbl_col_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
-            <th class="tbl_col_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
-            <th class="tbl_col_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
-            <th class="tbl_col_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="tbl_col_mail_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
+            <th class="tbl_col_mail_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
+            <th class="tbl_col_mail_traffic_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
+            <th class="tbl_col_mail_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_email"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
diff --git a/interface/web/mail/templates/mail_whitelist_list.htm b/interface/web/mail/templates/mail_whitelist_list.htm
index 1d77da29727432928e23f416badca4fd4ee8ccea..55e05670752ebe7125f5aa9a5d6a4d6a989cc2a8 100644
--- a/interface/web/mail/templates/mail_whitelist_list.htm
+++ b/interface/web/mail/templates/mail_whitelist_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_source" scope="col"><tmpl_var name="source_txt"></th>
             <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/spamfilter_blacklist_list.htm b/interface/web/mail/templates/spamfilter_blacklist_list.htm
index 389936b240ac77ebde959149fb484d766e78d7b0..473069ba326b38f6fb0c200181f1f0488fdd19af 100644
--- a/interface/web/mail/templates/spamfilter_blacklist_list.htm
+++ b/interface/web/mail/templates/spamfilter_blacklist_list.htm
@@ -23,7 +23,7 @@
             <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
             <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
             <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/spamfilter_policy_list.htm b/interface/web/mail/templates/spamfilter_policy_list.htm
index 00d0cfb4f830f9691dd6958cc77aa5f900fc8056..494961ca8683235625e33942ac061e2e24b1abfc 100644
--- a/interface/web/mail/templates/spamfilter_policy_list.htm
+++ b/interface/web/mail/templates/spamfilter_policy_list.htm
@@ -23,7 +23,7 @@
             <th class="tbl_col_spam_lover" scope="col"><tmpl_var name="spam_lover_txt"></th>
             <th class="tbl_col_banned_files_lover" scope="col"><tmpl_var name="banned_files_lover_txt"></th>
             <th class="tbl_col_bad_header_lover" scope="col"><tmpl_var name="bad_header_lover_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_policy_name"><input type="text" name="search_policy_name" value="{tmpl_var name='search_policy_name'}" /></td>
diff --git a/interface/web/mail/templates/spamfilter_users_list.htm b/interface/web/mail/templates/spamfilter_users_list.htm
index 74fa9f01f7bc4dc430e0477258d9e9bb8fe43fb0..0b5fd7170408bdf167d02f4675cc313718e6e380 100644
--- a/interface/web/mail/templates/spamfilter_users_list.htm
+++ b/interface/web/mail/templates/spamfilter_users_list.htm
@@ -23,7 +23,7 @@
             <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
             <th class="tbl_col_policy_id" scope="col"><tmpl_var name="policy_id_txt"></th>
             <th class="tbl_col_fullname" scope="col"><tmpl_var name="fullname_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_local"><select name="search_local">{tmpl_var name='search_local'}</select></td>
diff --git a/interface/web/mail/templates/spamfilter_whitelist_list.htm b/interface/web/mail/templates/spamfilter_whitelist_list.htm
index 10906074e6230dfca1bc34753b32aa0e1ab4fead..36bdfecc77f05060e3896b940dd985a739019fda 100644
--- a/interface/web/mail/templates/spamfilter_whitelist_list.htm
+++ b/interface/web/mail/templates/spamfilter_whitelist_list.htm
@@ -23,7 +23,7 @@
             <th class="tbl_col_priority" scope="col"><tmpl_var name="priority_txt"></th>
             <th class="tbl_col_rid" scope="col"><tmpl_var name="rid_txt"></th>
             <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/mail/templates/user_quota_stats_list.htm b/interface/web/mail/templates/user_quota_stats_list.htm
index 3c4d9ec7544d871a72106aa99231015084769c2a..c5e1fea3d5bb543a4f65e5906fdcb452575cbe01 100644
--- a/interface/web/mail/templates/user_quota_stats_list.htm
+++ b/interface/web/mail/templates/user_quota_stats_list.htm
@@ -9,9 +9,9 @@
           <tr>
             <th class="tbl_col_email" scope="col"><tmpl_var name="email_txt"></th>
             <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th>
-			<th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
-			<th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="quota_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+	    <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
+	    <th class="" scope="col" style="text-align:right;"><tmpl_var name="quota_txt"></th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_domain"><input type="text" name="search_email" value="{tmpl_var name='search_email'}" /></td>
diff --git a/interface/web/monitor/templates/datalog_list.htm b/interface/web/monitor/templates/datalog_list.htm
index eb617e5f8307cc67fd5095085c38f625c6021cfc..68f63c7b2267fe58168f2a02f748e34c816fb31b 100644
--- a/interface/web/monitor/templates/datalog_list.htm
+++ b/interface/web/monitor/templates/datalog_list.htm
@@ -12,7 +12,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_action" scope="col"><tmpl_var name="action_txt"></th>
             <th class="tbl_col_dbtable" scope="col"><tmpl_var name="dbtable_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_tstamp">&nbsp;</td>
diff --git a/interface/web/monitor/templates/syslog_list.htm b/interface/web/monitor/templates/syslog_list.htm
index 283ed1c850cff083f53f960238f93bde99560f8a..830876dc10543386fad0faa18a33daad1de78e4d 100644
--- a/interface/web/monitor/templates/syslog_list.htm
+++ b/interface/web/monitor/templates/syslog_list.htm
@@ -12,7 +12,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_loglevel" scope="col"><tmpl_var name="loglevel_txt"></th>
             <th class="tbl_col_message" scope="col"><tmpl_var name="message_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_tstamp">&nbsp;</td>
diff --git a/interface/web/sites/templates/cron_list.htm b/interface/web/sites/templates/cron_list.htm
index 5e00b5415d4d2db7dc47007cf0b58ea168967c63..d649d25df23197e4a2de0087f7bcaad234c356b7 100644
--- a/interface/web/sites/templates/cron_list.htm
+++ b/interface/web/sites/templates/cron_list.htm
@@ -27,7 +27,7 @@
             <th class="tbl_col_run_month" scope="col"><tmpl_var name="run_month_txt"></th>
             <th class="tbl_col_run_wday" scope="col"><tmpl_var name="run_wday_txt"></th>
             <th class="tbl_col_command" scope="col"><tmpl_var name="command_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/sites/templates/database_admin_list.htm b/interface/web/sites/templates/database_admin_list.htm
index 30938e6af4ce118da1e22fbb5f02b8fce2af4431..5756b92b2c49377462384154fdfb186fcb7e6e01 100644
--- a/interface/web/sites/templates/database_admin_list.htm
+++ b/interface/web/sites/templates/database_admin_list.htm
@@ -23,7 +23,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_database_user" scope="col"><tmpl_var name="database_user_txt"></th>
             <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm
index 7a9f637e0180aa399a13fbd798109f7a29821312..be82cc058fa615b8b3d06714b3ad73f9e20f141d 100644
--- a/interface/web/sites/templates/database_list.htm
+++ b/interface/web/sites/templates/database_list.htm
@@ -23,7 +23,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_user_txt"></th>
             <th class="tbl_col_database_name" scope="col"><tmpl_var name="database_name_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/sites/templates/ftp_user_list.htm b/interface/web/sites/templates/ftp_user_list.htm
index 39266dc80bc23e806108b9768b15e219d27efc0d..005d73cc033692451532514bdd4f829071d0e5e5 100644
--- a/interface/web/sites/templates/ftp_user_list.htm
+++ b/interface/web/sites/templates/ftp_user_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
             <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/sites/templates/shell_user_list.htm b/interface/web/sites/templates/shell_user_list.htm
index 5a13c1c88e031acb7f0e1f788b31596ff837e4c7..d098acc42e647dfb8dc1c73ce1720819f23e5ee0 100644
--- a/interface/web/sites/templates/shell_user_list.htm
+++ b/interface/web/sites/templates/shell_user_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
             <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/sites/templates/user_quota_stats_list.htm b/interface/web/sites/templates/user_quota_stats_list.htm
index a2cce3a7a2e6dc9a4eb12af5f33a71f7055a365b..e27bf3abf9233448afa1556c864e2991e016381d 100644
--- a/interface/web/sites/templates/user_quota_stats_list.htm
+++ b/interface/web/sites/templates/user_quota_stats_list.htm
@@ -9,11 +9,11 @@
           <tr>
             <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
             <th class="tbl_col_system_user" scope="col"><tmpl_var name="system_user_txt"></th>
-			<th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
-			<th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="soft_txt"></th>
-			<th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="hard_txt"></th>
-			<th class="tbl_col_system_user" scope="col" style="text-align:right;"><tmpl_var name="files_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+	    <th class="" scope="col" style="text-align:right;"><tmpl_var name="used_txt"></th>
+	    <th class="" scope="col" style="text-align:right;"><tmpl_var name="soft_txt"></th>
+	    <th class="" scope="col" style="text-align:right;"><tmpl_var name="hard_txt"></th>
+	    <th class="" scope="col" style="text-align:right;"><tmpl_var name="files_txt"></th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
diff --git a/interface/web/sites/templates/web_aliasdomain_list.htm b/interface/web/sites/templates/web_aliasdomain_list.htm
index 49d0aad3589c7d680ec352e0d9b74a4c0d1102de..f3791778ce8300c749d5ca1cc5f4e4c161eee1d7 100644
--- a/interface/web/sites/templates/web_aliasdomain_list.htm
+++ b/interface/web/sites/templates/web_aliasdomain_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
             <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/sites/templates/web_domain_admin_list.htm b/interface/web/sites/templates/web_domain_admin_list.htm
index b57a36f178c28c0ff78a2a3bfea38681a1dbf740..afc0ba65ea28a97b697e14171b6c2599e8202eca 100644
--- a/interface/web/sites/templates/web_domain_admin_list.htm
+++ b/interface/web/sites/templates/web_domain_admin_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_sys_groupid" scope="col"><tmpl_var name="sys_groupid_txt"></th>
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_domain_id"><input type="text" name="search_domain_id" size="4" value="{tmpl_var name='search_domain_id'}" /></td>
diff --git a/interface/web/sites/templates/web_domain_list.htm b/interface/web/sites/templates/web_domain_list.htm
index b3b31c1012cc6aabb29b39ada4539f455bada23e..c0989ebf6f0ee255b46b95cb24e76d6e6a5ec7f9 100644
--- a/interface/web/sites/templates/web_domain_list.htm
+++ b/interface/web/sites/templates/web_domain_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_domain_id"><input type="text" size="5" name="search_domain_id" value="{tmpl_var name='search_domain_id'}" /></td>
diff --git a/interface/web/sites/templates/web_folder_list.htm b/interface/web/sites/templates/web_folder_list.htm
index f679c7d893aba5f2816b699d92817962248c222a..52d85ca22961b52961d0f32c84b06251a5400fb8 100644
--- a/interface/web/sites/templates/web_folder_list.htm
+++ b/interface/web/sites/templates/web_folder_list.htm
@@ -21,7 +21,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
             <th class="tbl_col_path" scope="col"><tmpl_var name="path_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_list.php');">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/sites/templates/web_folder_user_list.htm b/interface/web/sites/templates/web_folder_user_list.htm
index 942d5071c9ea50e33f4815e17f7c4170f19e9282..e9630da8ae66efe27b74c7e0fc70cd7492d7568f 100644
--- a/interface/web/sites/templates/web_folder_user_list.htm
+++ b/interface/web/sites/templates/web_folder_user_list.htm
@@ -20,7 +20,7 @@
             <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
             <th class="tbl_col_web_folder_id" scope="col"><tmpl_var name="web_folder_id_txt"></th>
             <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','sites/web_folder_user_list.php');">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm
index 2e080bc39de2a1bd469cce6c9f1b3013cfdec1ee..113d60831dc720f8052fe22f97c058ee25884fc7 100644
--- a/interface/web/sites/templates/web_sites_stats_list.htm
+++ b/interface/web/sites/templates/web_sites_stats_list.htm
@@ -9,11 +9,11 @@
         <thead>
           <tr>
             <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
-            <th class="tbl_col_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
-            <th class="tbl_col_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
-            <th class="tbl_col_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="tbl_col_web_traffic_this_month" scope="col"><tmpl_var name="this_month_txt"></th>
+            <th class="tbl_col_web_traffic_last_month" scope="col"><tmpl_var name="last_month_txt"></th>
+            <th class="tbl_col_web_traffic_this_year" scope="col"><tmpl_var name="this_year_txt"></th>
+            <th class="tbl_col_web_traffic_last_year" scope="col"><tmpl_var name="last_year_txt"></th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_domain"><input type="text" name="search_domain" value="{tmpl_var name='search_domain'}" /></td>
diff --git a/interface/web/sites/templates/web_subdomain_list.htm b/interface/web/sites/templates/web_subdomain_list.htm
index 02e8312e3a5f223fe7767a821c76aa51ecf1d522..655c82cdd108a5516f2ccf6e7e7138b6001dc3b3 100644
--- a/interface/web/sites/templates/web_subdomain_list.htm
+++ b/interface/web/sites/templates/web_subdomain_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
             <th class="tbl_col_domain" scope="col"><tmpl_var name="domain_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/sites/templates/webdav_user_list.htm b/interface/web/sites/templates/webdav_user_list.htm
index 0fc8c8c4bd9288106b6b95dd1914cc3f7f09a9a4..35dce96a764f8ec2a71ece91f0eadd4571a21551 100644
--- a/interface/web/sites/templates/webdav_user_list.htm
+++ b/interface/web/sites/templates/webdav_user_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_parent_domain_id" scope="col"><tmpl_var name="parent_domain_id_txt"></th>
             <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/themes/default_combobox/css/additional.css b/interface/web/themes/default_combobox/css/additional.css
index 639320bfe3d2d39514a1b3ccba7e69d9339803a4..d35c12925d7256d3cdb0e87fe9cdfcdae1d56ab4 100644
--- a/interface/web/themes/default_combobox/css/additional.css
+++ b/interface/web/themes/default_combobox/css/additional.css
@@ -151,3 +151,5 @@ input.ui-button { padding: .4em 1em; }
 
 /* workarounds */
 button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
+.pnl_listarea th{cursor:pointer}
+.pnl_listarea th:hover{background-position:0 -15px!important}
diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index a9d7ca6079b82343c06ebba9fc974ee119624e90..7ba8c5026589923101b911daae77dc22606a138c 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -100,6 +100,28 @@
 			}
 		});
 
+		(function( $ ){
+		  $(".pnl_listarea th").live("click",  function(){
+		    if($(this).attr('class').length > 0 && $("#Filter").length > 0){
+		      eval($("#Filter").attr("onclick").replace(".php');",".php?orderby="+$(this).attr('class')+"');"));
+		      var element = $(this).attr('class');
+		      $("#pageForm").ajaxComplete(function() {
+			  if($("th."+element).css("background-position") == '0px -15px'){
+			    if($("th."+element).css("text-align") == "right"){
+			      $("th."+element).css("text-align","left");
+			    } else {
+			      $("th."+element).css("text-align","right");
+			    }
+			  } else {
+			    $(".pnl_listarea th").css("text-align","");
+			  }
+			  $(".pnl_listarea th").css("background-position","0 0");
+			  $("th."+element).css("background-position","0 -15px");
+		      });
+		    }
+		});
+		})( jQuery );
+
 		(function( $ ) {
 		$.widget( "ui.combobox", {
 			_create: function() {
diff --git a/interface/web/vm/templates/openvz_ip_list.htm b/interface/web/vm/templates/openvz_ip_list.htm
index a6398627d9078c454ddb8cf7b35763b80e40d76f..929e2af2ae9efc7e05a93960f1ca70d7ecec13c2 100644
--- a/interface/web/vm/templates/openvz_ip_list.htm
+++ b/interface/web/vm/templates/openvz_ip_list.htm
@@ -21,7 +21,7 @@
             <th class="tbl_col_vm_id" scope="col"><tmpl_var name="vm_id_txt"></th>
             <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
             <th class="tbl_col_reserved" scope="col"><tmpl_var name="reserved_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_server_id"><select name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
diff --git a/interface/web/vm/templates/openvz_ostemplate_list.htm b/interface/web/vm/templates/openvz_ostemplate_list.htm
index 832117124a3b5b359bae4e65970df268fa97b71c..d332c982dda50a32a3832c8d8242bcd21de448a3 100644
--- a/interface/web/vm/templates/openvz_ostemplate_list.htm
+++ b/interface/web/vm/templates/openvz_ostemplate_list.htm
@@ -22,7 +22,7 @@
             <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
             <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th>
             <th class="tbl_col_allservers" scope="col"><tmpl_var name="allservers_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/vm/templates/openvz_template_list.htm b/interface/web/vm/templates/openvz_template_list.htm
index ff62e1e0c3ceec6b30897028cf5b0c2bc5de267e..5bad23dacace1117dbe41d113129d2b1044ece8c 100644
--- a/interface/web/vm/templates/openvz_template_list.htm
+++ b/interface/web/vm/templates/openvz_template_list.htm
@@ -19,7 +19,7 @@
           <tr>
             <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th>
             <th class="tbl_col_template_name" scope="col"><tmpl_var name="template_name_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>
diff --git a/interface/web/vm/templates/openvz_vm_list.htm b/interface/web/vm/templates/openvz_vm_list.htm
index ad1522cfc32c7cb6e038af59b7534b780180fb75..fa6d4005d122a0db9b6604829b47d76a9e1246c9 100644
--- a/interface/web/vm/templates/openvz_vm_list.htm
+++ b/interface/web/vm/templates/openvz_vm_list.htm
@@ -24,7 +24,7 @@
             <th class="tbl_col_template_id" scope="col"><tmpl_var name="template_id_txt"></th>
             <th class="tbl_col_hostname" scope="col"><tmpl_var name="hostname_txt"></th>
             <th class="tbl_col_ip_address" scope="col"><tmpl_var name="ip_address_txt"></th>
-            <th class="tbl_col_buttons" scope="col">&nbsp;</th>
+            <th class="" scope="col">{tmpl_var name='search_limit'}</th>
           </tr>
           <tr>
             <td class="tbl_col_active"><select name="search_active">{tmpl_var name='search_active'}</select></td>