diff --git a/include/client/tickets.inc.php b/include/client/tickets.inc.php
index c2150b6515931efabfb1410e060b1f480af9da88..2c1a04a97c208e2bdadc6281cca2ee0cd093e9c0 100644
--- a/include/client/tickets.inc.php
+++ b/include/client/tickets.inc.php
@@ -24,7 +24,7 @@ if(isset($_REQUEST['status'])) { //Query string status has nothing to do with th
 	$results_type=__('Open Tickets');
 }
 
-$sortOptions=array('id'=>'`number`', 'subject'=>'subject.value',
+$sortOptions=array('id'=>'`number`', 'subject'=>'cdata.subject',
                     'status'=>'status.name', 'dept'=>'dept_name','date'=>'ticket.created');
 $orderWays=array('DESC'=>'DESC','ASC'=>'ASC');
 //Sorting options...
@@ -75,7 +75,7 @@ if($search) {
     } else {//Deep search!
         $queryterm=db_real_escape($_REQUEST['q'],false); //escape the term ONLY...no quotes.
         $qwhere.=' AND ( '
-                ." subject.value LIKE '%$queryterm%'"
+                ." cdata.subject LIKE '%$queryterm%'"
                 ." OR thread.body LIKE '%$queryterm%'"
                 .' ) ';
         $deep_search=true;