diff --git a/include/class.filter.php b/include/class.filter.php
index a69439d937d90f012f90902d717a06b9e2237a83..53801ce0d9d3b2618909ef97866092f7d9edd475 100644
--- a/include/class.filter.php
+++ b/include/class.filter.php
@@ -281,6 +281,22 @@ class Filter {
         if ($this->getCannedResponse())
             $ticket['cannedResponseId'] = $this->getCannedResponse();
     }
+    /* static */ function getSupportedMatches() {
+        return array(
+            'name'=>    "Sender's Name",
+            'email'=>   "Sender's Email",
+            'subject'=> 'Email Subject',
+            'body'=>    'Email Body/Text'
+        );
+    }
+    /* static */ function getSupportedMatchTypes() {
+        return array(
+            'equal'=>       'Equal',
+            'not_equal'=>   'Not Equal',
+            'contains'=>    'Contains',
+            'dn_contain'=>  'Does Not Contain'
+        );
+    }
 
     function update($vars,&$errors){
 
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index b23dd520bc8338ba4188162395f3045df6aaef3f..705b7f8ab3b18eb3cb98d13e40620bb7a993b703 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -1,9 +1,8 @@
 <?php
 if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access Denied');
 
-$matches=array('name'=>"Sender's Name",'email'=>"Sender's Email",'subject'=>'Email Subject','body'=>'Email Body/Text','header'=>'Email Header');
-$match_types=array('equal'=>'Equal','not_equal'=>'Not Equal','contains'=>'Contains','dn_contain'=>'Does Not Contain');
-
+$matches=Filter::getSupportedMatches();
+$match_types=Filter::getSupportedMatchTypes();
 
 $info=array();
 $qstr='';