diff --git a/data/CRMEntity.php b/data/CRMEntity.php
index 0673e70ae03311136efabfc949019b91ae13ffb3..2ff6a3c47640c7ccbd86a2867470917f8027d793 100644
--- a/data/CRMEntity.php
+++ b/data/CRMEntity.php
@@ -288,9 +288,10 @@ class CRMEntity {
                 break;
 		}
 		
-        $record_label = (count($entityFieldNames) > 1) ? 
-                        $this->column_fields[$entityFieldNames[0]].' '.$this->column_fields[$entityFieldNames[1]] : 
-                        $this->column_fields[$entityFieldNames[0]];
+		$record_label = '';
+		foreach($entityFieldNames as $entityFieldName) {
+			$record_label .= $this->column_fields[$entityFieldName]." ";
+		}
         $label = decode_html($record_label);
         $this->column_fields['label'] = $label;