diff --git a/application/controllers/system/Test.php b/application/controllers/system/Test.php
deleted file mode 100644
index 73cb99111..000000000
--- a/application/controllers/system/Test.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Test extends VileSci_Controller
-{
-	public function __construct()
-    {
-        parent::__construct();
-
-        $this->load->library('WidgetLib');
-    }
-
-	/**
-	 *
-	 */
-	public function sql()
-	{
-		echo $this->widgetlib->widget(
-			'FilterWidget',
-			array(
-				'app' => 'core',
-				'datasetName' => 'Arbeitspakete',
-				'query' => '
-					SELECT p.person_id AS "PersonId",
-							p.nachname AS "Nachname",
-							p.vorname AS "Vorname",
-							k.kontakt AS "Email",
-							p.aktiv AS "Aktiv"
-					  FROM public.tbl_person p INNER JOIN public.tbl_kontakt k USING(person_id)
-					 WHERE p.aktiv = TRUE
-					   AND p.person_id = k.person_id
-					   AND k.kontakttyp = \'email\'
-					   AND p.person_id < 1000
-				'
-			)
-		);
-	}
-
-	/**
-	 *
-	 */
-	public function direct()
-	{
-		echo $this->widgetlib->widget(
-			'FilterWidget',
-			array(
-				'app' => 'core',
-				'datasetName' => 'Arbeitspakete',
-				'filter_kurzbz' => 'This filter filters',
-				'query' => '
-					SELECT p.person_id AS "PersonId",
-							p.nachname AS "Nachname",
-							p.vorname AS "Vorname",
-							k.kontakt AS "Email",
-							p.aktiv AS "Aktiv"
-					  FROM public.tbl_person p INNER JOIN public.tbl_kontakt k USING(person_id)
-					 WHERE p.aktiv = TRUE
-					   AND p.person_id = k.person_id
-					   AND k.kontakttyp = \'email\'
-					   AND p.person_id < 1000
-				'
-			)
-		);
-	}
-}
diff --git a/application/controllers/system/TestFilterWidget.php b/application/controllers/system/TestFilterWidget.php
new file mode 100644
index 000000000..e269e4cf9
--- /dev/null
+++ b/application/controllers/system/TestFilterWidget.php
@@ -0,0 +1,59 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class TestFilterWidget extends VileSci_Controller
+{
+	public function __construct()
+    {
+        parent::__construct();
+
+        $this->load->library('WidgetLib');
+    }
+
+	/**
+	 *
+	 */
+	public function sql()
+	{
+		echo $this->widgetlib->widget(
+			'FilterWidget',
+			array(
+				'app' => 'core',
+				'datasetName' => 'kontakts',
+				'filterKurzbz' => 'This filter filters',
+				'query' => '
+					SELECT p.person_id AS "PersonId",
+							p.nachname AS "Nachname",
+							p.vorname AS "Vorname",
+							k.kontakt AS "Email",
+							p.aktiv AS "Aktiv"
+					  FROM public.tbl_person p INNER JOIN public.tbl_kontakt k USING(person_id)
+					 WHERE p.aktiv = TRUE
+					   AND p.person_id = k.person_id
+					   AND k.kontakttyp = \'email\'
+					   AND p.person_id < 1000
+				',
+				'checkboxes' => array('PersonId'),
+				'additionalColumns' => array('Delete', 'Edit'),
+				'formatRaw' => function($fieldName, $fieldValue, $datasetRaw) {
+
+					if ($fieldName == 'PersonId')
+					{
+						$datasetRaw->{$fieldName} = '<a href="view/'.$datasetRaw->PersonId.'">'.$fieldValue.'</a>';
+					}
+					if ($fieldName == 'Delete')
+					{
+						$datasetRaw->{$fieldName} = '<a href="delete/'.$datasetRaw->PersonId.'">Delete</a>';
+					}
+					if ($fieldName == 'Edit')
+					{
+						$datasetRaw->{$fieldName} = '<a href="edit/'.$datasetRaw->PersonId.'">Edit</a>';
+					}
+
+					return $datasetRaw;
+				}
+			)
+		);
+	}
+}
diff --git a/application/views/templates/header.php b/application/views/templates/header.php
index 47befaac7..883e7cc32 100644
--- a/application/views/templates/header.php
+++ b/application/views/templates/header.php
@@ -70,8 +70,8 @@ if($jqueryV1 && $jqueryCurrent)
 		$(document).ready(function()
 		{
 			// Checks if the table contains data (rows)
-			if ($('#<?php echo $tableid; ?>').find('tbody:empty').length > 0
-				&& $('#<?php echo $tableid; ?>').find('tr:empty').length > 0)
+			if ($('#<?php echo $tableid; ?>').find('tbody:empty').length == 0
+				&& $('#<?php echo $tableid; ?>').find('tr:empty').length == 0)
 			{
 				$("#<?php echo $tableid; ?>").tablesorter(
 				{
diff --git a/application/views/widgets/filter/tableDataset.php b/application/views/widgets/filter/tableDataset.php
index b832b3178..160345692 100644
--- a/application/views/widgets/filter/tableDataset.php
+++ b/application/views/widgets/filter/tableDataset.php
@@ -2,6 +2,8 @@
 	$results = $dataset->retval;
 
 	$selectedFields = FilterWidget::getSelectedFields();
+	$additionalColumns = FilterWidget::getAdditionalColumns();
+	$checkboxes = FilterWidget::getCheckboxes();
 ?>
 
 <div>
@@ -9,11 +11,27 @@
 		<thead>
 			<tr>
 			<?php
+				if ($checkboxes != null)
+				{
+			?>
+					<th title="Select">Select</th>
+			<?php
+				}
+
 				for ($selectedFieldsCounter = 0; $selectedFieldsCounter < count($selectedFields); $selectedFieldsCounter++)
 				{
-					$selectedFilter = $selectedFields[$selectedFieldsCounter];
+					$selectedField = $selectedFields[$selectedFieldsCounter];
 			?>
-					<th title="<?php echo $selectedFilter; ?>"><?php echo $selectedFilter; ?></th>
+					<th title="<?php echo $selectedField; ?>"><?php echo $selectedField; ?></th>
+			<?php
+				}
+			?>
+			<?php
+				for ($additionalColumnsCounter = 0; $additionalColumnsCounter < count($additionalColumns); $additionalColumnsCounter++)
+				{
+					$additionalColumn = $additionalColumns[$additionalColumnsCounter];
+			?>
+					<th title="<?php echo $additionalColumn; ?>"><?php echo $additionalColumn; ?></th>
 			<?php
 				}
 			?>
@@ -27,29 +45,43 @@
 			?>
 					<tr>
 			<?php
+					if ($checkboxes != null)
+					{
+			?>
+					<td>
+						<input type="checkbox" name="<?php echo $checkboxes[0]; ?>[]" value="<?php echo $result->{$checkboxes[0]}; ?>">
+					</td>
+			<?php
+					}
+
 					for ($selectedFieldsCounter = 0; $selectedFieldsCounter < count($selectedFields); $selectedFieldsCounter++)
 					{
-						$selectedFilter = $selectedFields[$selectedFieldsCounter];
+						$selectedField = $selectedFields[$selectedFieldsCounter];
 
-						if (array_key_exists($selectedFilter, $result))
+						if (array_key_exists($selectedField, $result))
 						{
+							$formattedResult = FilterWidget::formatRaw($selectedField, $result->{$selectedField}, $result);
 			?>
 						<td>
 							<?php
-
-								if (is_bool($result->{$selectedFilter}))
-								{
-									echo $result->{$selectedFilter} === true ? 'true' : 'false';
-								}
-								else
-								{
-									echo $result->{$selectedFilter};
-								}
+								echo $formattedResult->{$selectedField};
 							?>
 						</td>
 			<?php
 						}
 					}
+					for ($additionalColumnsCounter = 0; $additionalColumnsCounter < count($additionalColumns); $additionalColumnsCounter++)
+					{
+						$additionalColumn = $additionalColumns[$additionalColumnsCounter];
+						$formattedResult = FilterWidget::formatRaw($additionalColumn, null, $result);
+			?>
+						<td>
+							<?php
+								echo $formattedResult->{$additionalColumn};
+							?>
+						</td>
+			<?php
+					}
 			?>
 					</tr>
 			<?php
diff --git a/application/widgets/FilterWidget.php b/application/widgets/FilterWidget.php
index dbdef94e6..f8c2881c2 100644
--- a/application/widgets/FilterWidget.php
+++ b/application/widgets/FilterWidget.php
@@ -6,10 +6,14 @@
 class FilterWidget extends Widget
 {
 	const APP_PARAMETER = 'app';
-	const QUERY_PARAMETER = 'query';
 	const DATASET_NAME_PARAMETER = 'datasetName';
 	const FILTER_KURZBZ = 'filterKurzbz';
 	const FILTER_ID = 'filterId';
+	const QUERY_PARAMETER = 'query';
+	const DB_RESULT = 'dbResult';
+	const ADDITIONAL_COLUMNS = 'additionalColumns';
+	const FORMAT_RAW = 'formatRaw';
+	const CHECKBOXES = 'checkboxes';
 
 	const DATASET_PARAMETER = 'dataset';
 	const METADATA_PARAMETER = 'metaData';
@@ -48,6 +52,11 @@ class FilterWidget extends Widget
 	private $datasetName;
 	private $filterKurzbz;
 	private $filterId;
+	private $additionalColumns;
+	private $formatRaw;
+	private $checkboxes;
+
+	private static $FilterWidgetInstance;
 
 	/**
 	 *
@@ -62,6 +71,8 @@ class FilterWidget extends Widget
 
 		//
 		$this->load->model('system/Filters_model', 'FiltersModel');
+
+		self::$FilterWidgetInstance = $this;
 	}
 
 	/**
@@ -107,12 +118,25 @@ class FilterWidget extends Widget
 		return self::_getFromSession(self::SELECTED_FILTERS);
 	}
 
+	/**
+	 *
+	 */
+	public static function getAdditionalColumns()
+	{
+		return self::_getFromSession(self::ADDITIONAL_COLUMNS);
+	}
+
 	/**
 	 *
 	 */
 	public static function loadViewTableDataset($dataset)
 	{
-		self::_loadView(self::WIDGET_URL_TABLE_DATASET, array(self::DATASET_PARAMETER => $dataset));
+		self::_loadView(
+			self::WIDGET_URL_TABLE_DATASET,
+			array(
+				self::DATASET_PARAMETER => $dataset
+			)
+		);
 	}
 
 	/**
@@ -207,6 +231,39 @@ class FilterWidget extends Widget
 		return sprintf($html, $filterMetaData->name.'-operation', $filterMetaData->name, $activeFilterValue);
 	}
 
+	/**
+	 *
+	 */
+	public static function formatRaw($fieldName, $fieldValue, $datasetRaw)
+	{
+		$tmpDatasetRaw = clone $datasetRaw;
+
+		if (is_bool($fieldValue))
+		{
+			$tmpDatasetRaw->{$fieldName} = $fieldValue === true ? 'true' : 'false';
+		}
+
+		$formatRaw = self::$FilterWidgetInstance->getFormatRaw();
+
+		if ($formatRaw != null)
+		{
+			$tmpDatasetRaw = $formatRaw($fieldName, $fieldValue, $tmpDatasetRaw);
+		}
+
+		return $tmpDatasetRaw;
+	}
+
+	/**
+	 *
+	 */
+	public static function getCheckboxes()
+	{
+		return self::$FilterWidgetInstance->_getCheckboxes();
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Protected
+
 	/**
 	 *
 	 */
@@ -223,6 +280,25 @@ class FilterWidget extends Widget
 		);
 	}
 
+	/**
+	 *
+	 */
+	protected function getFormatRaw()
+	{
+		return $this->formatRaw;
+	}
+
+	/**
+	 *
+	 */
+	protected function _getCheckboxes()
+	{
+		return $this->checkboxes;
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Private
+
 	/**
 	 *
 	 */
@@ -315,6 +391,11 @@ class FilterWidget extends Widget
 			$filterSessionArray[self::ACTIVE_FILTERS_OPERATION] = array();
 		}
 
+		if (!isset($filterSessionArray[self::ADDITIONAL_COLUMNS]))
+		{
+			$filterSessionArray[self::ADDITIONAL_COLUMNS] = array();
+		}
+
 		$this->session->set_userdata(self::SESSION_NAME, $filterSessionArray);
 	}
 
@@ -323,48 +404,80 @@ class FilterWidget extends Widget
 	 */
 	private function _initFilterWidget($args)
 	{
-		if (is_array($args) && count($args) > 0)
+		$this->app = null;
+		$this->query = null;
+		$this->datasetName = null;
+		$this->filterKurzbz = null;
+		$this->filterId = null;
+		$this->additionalColumns = null;
+		$this->formatRaw = null;
+		$this->checkboxes = null;
+
+		if (!is_array($args) || (is_array($args) && count($args) == 0))
 		{
-			if (isset($args[self::APP_PARAMETER]))
-			{
-				$this->app = $args[self::APP_PARAMETER];
-			}
-			else
-			{
-				show_error('The "'.self::APP_PARAMETER.'" parameter must be specified');
-			}
-
-			if (isset($args[self::DATASET_NAME_PARAMETER]))
-			{
-				$this->datasetName = $args[self::DATASET_NAME_PARAMETER];
-			}
-			else
-			{
-				show_error('The "'.self::DATASET_NAME_PARAMETER.'" parameter must be specified');
-			}
-
-			if (isset($args[self::QUERY_PARAMETER]))
-			{
-				$this->query = $args[self::QUERY_PARAMETER];
-			}
-			else
-			{
-				show_error('The "'.self::QUERY_PARAMETER.'" parameter must be specified');
-			}
-
-			if (isset($args[self::FILTER_KURZBZ]))
-			{
-				$this->filterKurzbz = $args[self::FILTER_KURZBZ];
-			}
-
-			if (isset($args[self::FILTER_ID]))
-			{
-				$this->filterId = $args[self::FILTER_ID];
-			}
+			show_error('Second parameter must be a not empty associative array');
 		}
 		else
 		{
-			show_error('Second parameter must be an associative array');
+			if ((
+					!isset($args[self::APP_PARAMETER])
+					&& !isset($args[self::DATASET_NAME_PARAMETER])
+					&& !isset($args[self::FILTER_KURZBZ])
+				)
+				&& !isset($args[self::FILTER_ID]))
+			{
+				show_error('At least one parameters must be specified 1');
+			}
+			else
+			{
+				if (!isset($args[self::QUERY_PARAMETER]) && !isset($args[self::DB_RESULT]))
+				{
+					show_error('At least one parameters must be specified 2');
+				}
+				else
+				{
+					if (isset($args[self::APP_PARAMETER])
+						&& isset($args[self::DATASET_NAME_PARAMETER])
+						&& isset($args[self::FILTER_KURZBZ]))
+					{
+						$this->app = $args[self::APP_PARAMETER];
+						$this->datasetName = $args[self::DATASET_NAME_PARAMETER];
+						$this->filterKurzbz = $args[self::FILTER_KURZBZ];
+					}
+					else
+					{
+						$this->filterId = $args[self::FILTER_ID];
+					}
+
+					if (isset($args[self::QUERY_PARAMETER]))
+					{
+						$this->query = $args[self::QUERY_PARAMETER];
+					}
+					elseif (isset($args[self::DB_RESULT]))
+					{
+						$this->query = $args[self::DB_RESULT];
+					}
+				}
+			}
+
+			if (isset($args[self::ADDITIONAL_COLUMNS])
+				&& is_array($args[self::ADDITIONAL_COLUMNS])
+				&& count($args[self::ADDITIONAL_COLUMNS]) > 0)
+			{
+				$this->additionalColumns = $args[self::ADDITIONAL_COLUMNS];
+			}
+
+			if (isset($args[self::FORMAT_RAW]) && is_callable($args[self::FORMAT_RAW]))
+			{
+				$this->formatRaw = $args[self::FORMAT_RAW];
+			}
+
+			if (isset($args[self::CHECKBOXES])
+				&& is_array($args[self::CHECKBOXES])
+				&& count($args[self::CHECKBOXES]) > 0)
+			{
+				$this->checkboxes = $args[self::CHECKBOXES];
+			}
 		}
 	}
 
@@ -388,15 +501,29 @@ class FilterWidget extends Widget
 		//
 		$this->FiltersModel->addLimit(1);
 
-		//
-		$filter = $this->FiltersModel->loadWhere(
-			array(
+		$whereParameters = null;
+
+		if ($this->filterId == null)
+		{
+			$whereParameters = array(
 				'app' => $this->app,
 				'dataset_name' => $this->datasetName,
+				'filter_kurzbz' => $this->filterKurzbz,
 				'uid' => getAuthUID(),
 				'default_filter' => true
-			)
-		);
+			);
+		}
+		else
+		{
+			$whereParameters = array(
+				'filter_id' => $this->filter_id,
+				'uid' => getAuthUID(),
+				'default_filter' => true
+			);
+		}
+
+		//
+		$filter = $this->FiltersModel->loadWhere($whereParameters);
 
 		$jsonEncodedFilter = null;
 
@@ -585,7 +712,8 @@ class FilterWidget extends Widget
 	{
 		$filterSessionArray = array(
 			self::SELECTED_FIELDS => $this->_getSelectedFieldsFromPost(),
-			self::SELECTED_FILTERS => $this->_getSelectedFiltersFromPost()
+			self::SELECTED_FILTERS => $this->_getSelectedFiltersFromPost(),
+			self::ADDITIONAL_COLUMNS => $this->additionalColumns
 		);
 
 		$filterSessionArray[self::ACTIVE_FILTERS] = array();
@@ -626,49 +754,52 @@ class FilterWidget extends Widget
 
 			foreach ($activeFilters as $field => $activeFilterValue)
 			{
-				if ($first)
+				if (trim($activeFilterValue) != '')
 				{
-					$first = false;
-				}
-				else
-				{
-					$where .= ' AND ';
-				}
-
-				if (isset($activeFiltersOperation[$field]))
-				{
-					$where .= '"'.$field.'"';
-					$condition = '';
-
-					switch ($activeFiltersOperation[$field])
+					if ($first)
 					{
-						case self::OP_EQUAL:
-							$condition = ' = '.$activeFilterValue;
-							break;
-						case self::OP_NOT_EQUAL:
-							$condition = ' != '.$activeFilterValue;
-							break;
-						case self::OP_GREATER_THAN:
-							$condition = ' > '.$activeFilterValue;
-							break;
-						case self::OP_LESS_THAN:
-							$condition = ' < '.$activeFilterValue;
-							break;
-						case self::OP_CONTAINS:
-							$condition = ' ILIKE \'%'.$activeFilterValue.'%\'';
-							break;
-						case self::OP_NOT_CONTAINS:
-							$condition = ' NOT ILIKE \'%'.$activeFilterValue.'%\'';
-							break;
-						case self::OP_IS_TRUE:
-							$condition = ' IS TRUE';
-							break;
-						case self::OP_IS_FALSE:
-							$condition = ' IS FALSE';
-							break;
+						$first = false;
+					}
+					else
+					{
+						$where .= ' AND ';
 					}
 
-					$where .= $condition;
+					if (isset($activeFiltersOperation[$field]))
+					{
+						$where .= '"'.$field.'"';
+						$condition = '';
+
+						switch ($activeFiltersOperation[$field])
+						{
+							case self::OP_EQUAL:
+								$condition = ' = '.$activeFilterValue;
+								break;
+							case self::OP_NOT_EQUAL:
+								$condition = ' != '.$activeFilterValue;
+								break;
+							case self::OP_GREATER_THAN:
+								$condition = ' > '.$activeFilterValue;
+								break;
+							case self::OP_LESS_THAN:
+								$condition = ' < '.$activeFilterValue;
+								break;
+							case self::OP_CONTAINS:
+								$condition = ' ILIKE \'%'.$activeFilterValue.'%\'';
+								break;
+							case self::OP_NOT_CONTAINS:
+								$condition = ' NOT ILIKE \'%'.$activeFilterValue.'%\'';
+								break;
+							case self::OP_IS_TRUE:
+								$condition = ' IS TRUE';
+								break;
+							case self::OP_IS_FALSE:
+								$condition = ' IS FALSE';
+								break;
+						}
+
+						$where .= $condition;
+					}
 				}
 			}