diff --git a/data/CRMEntity.php b/data/CRMEntity.php
index 425f7135fa89142aec7bd9a0c48a8371854d3be4..0673e70ae03311136efabfc949019b91ae13ffb3 100644
--- a/data/CRMEntity.php
+++ b/data/CRMEntity.php
@@ -281,9 +281,17 @@ class CRMEntity {
 
 		$entityFields = Vtiger_Functions::getEntityModuleInfo($module);
         $entityFieldNames  = explode(',', $entityFields['fieldname']);
-        $label = (count($entityFieldNames) > 1) ? 
+        switch ($module) {
+            case 'HelpDesk': $entityFieldNames = array('ticket_title');
+                break;
+            case 'Documents': $entityFieldNames = array('notes_title');
+                break;
+		}
+		
+        $record_label = (count($entityFieldNames) > 1) ? 
                         $this->column_fields[$entityFieldNames[0]].' '.$this->column_fields[$entityFieldNames[1]] : 
                         $this->column_fields[$entityFieldNames[0]];
+        $label = decode_html($record_label);
         $this->column_fields['label'] = $label;
 
 		if ($this->mode == 'edit') {