diff --git a/include/class.forms.php b/include/class.forms.php
index 555ef456bcf26da0fb7e35aec53edc23415beb2e..7e59dd169735cd629f749fb435027923a94c79eb 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -970,6 +970,10 @@ class FormField {
             return __('%s contains "%s"');
         case 'match':
             return __('%s matches pattern %s');
+        case 'includes':
+            return __('%s in (%s)');
+        case '!includes':
+            return __('%s not in (%s)');
         }
     }
     function describeSearch($method, $value, $name=false) {
diff --git a/include/class.search.php b/include/class.search.php
index c754b40680a98ed4140633aae00754e974c1c834..a64d216c9a1d6913d441717bbda00c272adcfa72 100644
--- a/include/class.search.php
+++ b/include/class.search.php
@@ -1055,6 +1055,17 @@ class AssigneeChoiceField extends ChoiceField {
         }
         return $Q;
     }
+
+    function describeSearchMethod($method) {
+        switch ($method) {
+        case 'assigned':
+            return __('assigned');
+        case '!assigned':
+            return __('unassigned');
+        default:
+            return parent::describeSearchMethod($method);
+        }
+    }
 }
 
 class TicketStateChoiceField extends ChoiceField {
diff --git a/include/staff/templates/advanced-search.tmpl.php b/include/staff/templates/advanced-search.tmpl.php
index 908126e9b9c7d34ebd5ac02a73c54e4f689dad87..b31763e4e666ac8951ba13f44729b33fed2caad8 100644
--- a/include/staff/templates/advanced-search.tmpl.php
+++ b/include/staff/templates/advanced-search.tmpl.php
@@ -16,6 +16,7 @@ $errors = !!$form->errors();
 $inbody = false;
 $first_field = true;
 foreach ($form->getFields() as $name=>$field) {
+    ?><input type="hidden" name="fields[]" value="<?php echo $name; ?>"/><?php
     @list($name, $sub) = explode('+', $field->get('name'), 2);
     if ($sub === 'search') {
         if (!$first_field) {