diff --git a/data/web/inc/lib/ssp.class.php b/data/web/inc/lib/ssp.class.php
index a06e7d09e..503f9b295 100644
--- a/data/web/inc/lib/ssp.class.php
+++ b/data/web/inc/lib/ssp.class.php
@@ -177,6 +177,7 @@ class SSP {
 	{
 		$globalSearch = array();
 		$columnSearch = array();
+		$joins = array();
 		$dtColumns = self::pluck( $columns, 'dt' );
 
 		if ( isset($request['search']) && $request['search']['value'] != '' ) {
@@ -184,13 +185,19 @@ class SSP {
 
 			for ( $i=0, $ien=count($request['columns']) ; $i<$ien ; $i++ ) {
 				$requestColumn = $request['columns'][$i];
-				$columnIdx = array_search( $requestColumn['data'], $dtColumns );
+				$columnIdx = array_search( $i, $dtColumns );
 				$column = $columns[ $columnIdx ];
 
 				if ( $requestColumn['searchable'] == 'true' ) {
 					if(!empty($column['db'])){
-						$binding = self::bind( $bindings, '%'.$str.'%', PDO::PARAM_STR );
-						$globalSearch[] = "`".$tablesAS."`.`".$column['db']."` LIKE ".$binding;
+    					$binding = self::bind( $bindings, '%'.$str.'%', PDO::PARAM_STR );
+    					
+    					if(isset($column['search']['join'])) {
+            				$joins[] = $column['search']['join'];
+            				$globalSearch[] = $column['search']['where_column'].' LIKE '.$binding;
+        				} else {
+						    $globalSearch[] = "`".$tablesAS."`.`".$column['db']."` LIKE ".$binding;
+						}
 					}
 				}
 			}
@@ -227,12 +234,17 @@ class SSP {
 				implode(' AND ', $columnSearch) :
 				$where .' AND '. implode(' AND ', $columnSearch);
 		}
+		
+		$join = '';
+		if( count($joins) ) {
+    		$join = implode(' ', $joins);
+		}
 
 		if ( $where !== '' ) {
 			$where = 'WHERE '.$where;
 		}
 
-		return $where;
+		return [$join, $where];
 	}
 
 
@@ -270,13 +282,14 @@ class SSP {
 		// Build the SQL query string from the request
 		list($select, $order) = self::order( $tablesAS, $request, $columns );
 		$limit = self::limit( $request, $columns );
-		$where = self::filter( $tablesAS, $request, $columns, $bindings );
+		list($join, $where) = self::filter( $tablesAS, $request, $columns, $bindings );
 
 		// Main query to actually get the data
 		$data = self::sql_exec( $db, $bindings,
 			"SELECT `$tablesAS`.`".implode("`, `$tablesAS`.`", self::pluck($columns, 'db'))."`
 			 $select
 			 FROM `$table` AS `$tablesAS`
+			 $join
 			 $where
 			 $order
 			 $limit"
@@ -284,15 +297,16 @@ class SSP {
 
 		// Data set length after filtering
 		$resFilterLength = self::sql_exec( $db, $bindings,
-			"SELECT COUNT(`{$primaryKey}`)
+			"SELECT COUNT(`{$tablesAS}`.`{$primaryKey}`)
 			 FROM   `$table` AS `$tablesAS`
+			 $join
 			 $where"
 		);
 		$recordsFiltered = $resFilterLength[0][0];
 
 		// Total data set length
 		$resTotalLength = self::sql_exec( $db,
-			"SELECT COUNT(`{$primaryKey}`)
+			"SELECT COUNT(`{$tablesAS}`.`{$primaryKey}`)
 			 FROM   `$table` AS `$tablesAS`"
 		);
 		$recordsTotal = $resTotalLength[0][0];
@@ -362,7 +376,7 @@ class SSP {
 		// Build the SQL query string from the request
 		list($select, $order) = self::order( $tablesAS, $request, $columns );
 		$limit = self::limit( $request, $columns );
-		$where = self::filter( $tablesAS, $request, $columns, $bindings );
+		list($join_filter, $where) = self::filter( $tablesAS, $request, $columns, $bindings );
 
 		// whereResult can be a simple string, or an assoc. array with a
 		// condition and bindings
@@ -388,7 +402,9 @@ class SSP {
 			 $select
 			 FROM `$table` AS `$tablesAS`
 			 $join
+			 $join_filter
 			 $where
+			 GROUP BY `{$tablesAS}`.`{$primaryKey}`
 			 $order
 			 $limit"
 		);
@@ -398,18 +414,22 @@ class SSP {
 			"SELECT COUNT(`{$tablesAS}`.`{$primaryKey}`)
 			 FROM   `$table` AS `$tablesAS`
 			 $join
-			 $where"
+			 $join_filter
+			 $where
+			 GROUP BY `{$tablesAS}`.`{$primaryKey}`"
 		);
-		$recordsFiltered = $resFilterLength[0][0];
+		$recordsFiltered = (isset($resFilterLength[0])) ? $resFilterLength[0][0] : 0;
 
 		// Total data set length
 		$resTotalLength = self::sql_exec( $db, $bindings,
 			"SELECT COUNT(`{$tablesAS}`.`{$primaryKey}`)
 			 FROM   `$table` AS `$tablesAS`
       $join
-      $where"
+      $join_filter
+      $where
+      GROUP BY `{$tablesAS}`.`{$primaryKey}`"
 		);
-		$recordsTotal = $resTotalLength[0][0];
+		$recordsTotal = (isset($resTotalLength[0])) ? $resTotalLength[0][0] : 0;
 
 		/*
 		 * Output
diff --git a/data/web/js/site/mailbox.js b/data/web/js/site/mailbox.js
index b1ec94824..cc316b713 100644
--- a/data/web/js/site/mailbox.js
+++ b/data/web/js/site/mailbox.js
@@ -613,7 +613,7 @@ jQuery(function($){
         {
           title: 'Tags',
           data: 'tags',
-          searchable: false,
+          searchable: true,
           orderable: false,
           defaultContent: '',
           className: 'none'
@@ -1107,6 +1107,7 @@ jQuery(function($){
         {
           title: 'Tags',
           data: 'tags',
+          searchable: true,
           defaultContent: '',
           className: 'none'
         },
diff --git a/data/web/json_api.php b/data/web/json_api.php
index 403b5a792..05d549030 100644
--- a/data/web/json_api.php
+++ b/data/web/json_api.php
@@ -535,6 +535,7 @@ if (isset($_GET['query'])) {
                   ['db' => 'defquota', 'dt' => 7],
                   ['db' => 'maxquota', 'dt' => 8],
                   ['db' => 'backupmx', 'dt' => 10],
+                  ['db' => 'tags', 'dt' => 14, 'dummy' => true, 'search' => ['join' => 'LEFT JOIN `tags_domain` AS `td` ON `td`.`domain` = `d`.`domain`', 'where_column' => '`td`.`tag_name`']],
                   ['db' => 'active', 'dt' => 15],
                 ];
 
@@ -1061,6 +1062,7 @@ if (isset($_GET['query'])) {
                   ['db' => 'last_pw_change', 'dt' => 5, 'dummy' => true, 'order_subquery' => "JSON_EXTRACT(attributes, '$.passwd_update')"],
                   ['db' => 'in_use', 'dt' => 6, 'dummy' => true, 'order_subquery' => "(SELECT SUM(bytes) FROM `quota2` WHERE `quota2`.`username` = `m`.`username`) / `m`.`quota`"],
                   ['db' => 'messages', 'dt' => 17, 'dummy' => true, 'order_subquery' => "SELECT SUM(messages) FROM `quota2` WHERE `quota2`.`username` = `m`.`username`"],
+                  ['db' => 'tags', 'dt' => 20, 'dummy' => true, 'search' => ['join' => 'LEFT JOIN `tags_mailbox` AS `tm` ON `tm`.`username` = `m`.`username`', 'where_column' => '`tm`.`tag_name`']],
                   ['db' => 'active', 'dt' => 21]
                 ];