diff --git a/application/views/helpers/FormDataFilter.php b/application/views/helpers/FormDataFilter.php
index f3b49916..3bd6153b 100644
--- a/application/views/helpers/FormDataFilter.php
+++ b/application/views/helpers/FormDataFilter.php
@@ -167,6 +167,9 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement
                 $filter->setExpression(json_decode($filter->getExpression()));
             }
 
+            if ($filter->getExpression() === true) {
+                return '';
+            }
             $dummy = IcingaObject::createByType($type);
             $col = $filter->getColumn();
             if ($dummy->hasProperty($col)) {
@@ -224,8 +227,6 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement
                 $this->elementId('value', $filter),
                 $value
             );
-
-            $value = '(' . implode('|', $value) . ')';
         }
 
         return $this->view->formText(
@@ -298,7 +299,7 @@ class Zend_View_Helper_FormDataFilter extends Zend_View_Helper_FormElement
             '<=' => '<=',
             'in' => 'in',
             'contains' => 'contains',
-            // 'true' => 'is true (or set)',
+            'true' => 'is true (or set)',
         );
 
         if ($filter === null) {
diff --git a/library/Director/IcingaConfig/AssignRenderer.php b/library/Director/IcingaConfig/AssignRenderer.php
index 14422f7f..4eb50694 100644
--- a/library/Director/IcingaConfig/AssignRenderer.php
+++ b/library/Director/IcingaConfig/AssignRenderer.php
@@ -133,6 +133,9 @@ class AssignRenderer
                 );
             }
         } elseif ($filter instanceof FilterMatch) {
+            if ($rawExpression === true) {
+                return $column;
+            }
             if (strpos($expression, '*') === false) {
                 return $this->renderEquals($column, $expression);
             } else {
diff --git a/public/css/module.less b/public/css/module.less
index 0d516da4..09b83415 100644
--- a/public/css/module.less
+++ b/public/css/module.less
@@ -1386,8 +1386,8 @@ div.filter-expression {
         margin: 0 0.3em;
         &.wide {
             min-width: 6em;
-            max-width: 6em;
-            width: 6em;
+            max-width: 8em;
+            width: 8em;
         }
     }