diff --git a/handlers/views_handler_filter_combine.inc b/handlers/views_handler_filter_combine.inc
index c9def53..7d30a3a 100644
--- a/handlers/views_handler_filter_combine.inc
+++ b/handlers/views_handler_filter_combine.inc
@@ -55,7 +55,8 @@ class views_handler_filter_combine extends views_handler_filter_string {
     // Only add the fields if they have a proper field and table alias.
     foreach ($this->options['fields'] as $id) {
       $field = $this->view->field[$id];
-      // Always add the table of the selected fields to be sure a table alias exists.
+      // Always add the table of the selected fields to be sure a table alias
+      // exists.
       $field->ensure_my_table();
       if (!empty($field->field_alias) && !empty($field->field_alias)) {
         $fields[] = "$field->table_alias.$field->real_field";
@@ -66,7 +67,7 @@ class views_handler_filter_combine extends views_handler_filter_string {
       $seperated_fields = array();
       foreach ($fields as $key => $field) {
         $seperated_fields[] = $field;
-        if ($key < $count-1) {
+        if ($key < $count - 1) {
           $seperated_fields[] = "' '";
         }
       }
@@ -94,6 +95,39 @@ class views_handler_filter_combine extends views_handler_filter_string {
     $this->query->add_where_expression($this->options['group'], "$field LIKE $placeholder", array($placeholder => '%' . db_like($this->value) . '%'));
   }
 
+  function op_word($field) {
+    $where = $this->operator == 'word' ? db_or() : db_and();
+
+    // Don't filter on empty strings.
+    if (empty($this->value)) {
+      return;
+    }
+
+    preg_match_all('/ (-?)("[^"]+"|[^" ]+)/i', ' ' . $this->value, $matches, PREG_SET_ORDER);
+    foreach ($matches as $match) {
+      $phrase = FALSE;
+      // Strip off phrase quotes.
+      if ($match[2]{0} == '"') {
+        $match[2] = substr($match[2], 1, -1);
+        $phrase = TRUE;
+      }
+      $words = trim($match[2], ',?!();:-');
+      $words = $phrase ? array($words) : preg_split('/ /', $words, -1, PREG_SPLIT_NO_EMPTY);
+      $placeholder = $this->placeholder();
+      foreach ($words as $word) {
+        $where->where($field . " LIKE $placeholder", array($placeholder => '%' . db_like(trim($word, " ,!?")) . '%'));
+      }
+    }
+
+    if (!$where) {
+      return;
+    }
+
+    // previously this was a call_user_func_array but that's unnecessary
+    // as views will unpack an array that is a single arg.
+    $this->query->add_where($this->options['group'], $where);
+  }
+
   function op_starts($field) {
     $placeholder = $this->placeholder();
     $this->query->add_where_expression($this->options['group'], "$field LIKE $placeholder", array($placeholder => db_like($this->value) . '%'));