diff --git a/data/CRMEntity.php b/data/CRMEntity.php
index daede567cda6d20cf3a35dd89d49aca281d32121..9451472aa4f9f3e2f4bb62ad5d88f5cf2e4a6c28 100644
--- a/data/CRMEntity.php
+++ b/data/CRMEntity.php
@@ -3140,7 +3140,10 @@ class TrackableObject implements ArrayAccess, IteratorAggregate {
 
 	#[\ReturnTypeWillChange]
 	function offsetSet($key, $value) {
-            if(is_array($value)) $value = !empty($value) && array_key_exists(0,$value) ? $value[0] : ""; //modified to prevent warning of Undefined array key 0 .
+		// file_put_contents('test7arrayvalue.log',print_r($value,true),FILE_APPEND);
+		// file_put_contents("duparray.log", sprintf("ENTRIES: %s\n", var_export($value, true)), FILE_APPEND);
+		// file_put_contents("duparray.log", sprintf("ENTRIES: %s\n", var_export($key, true)), FILE_APPEND);
+		if(is_array($value)) $value = empty($value) ? "" : (array_key_exists(0, $value) ? $value[0] : ""); //it is an associative array without a key 0 modified to prevent warning of Undefined array key 0 .
 		if($this->tracking && $this->trackingEnabled) {
 			$olderValue = $this->offsetGet($key);
 			// decode_html only expects string
diff --git a/data/VTEntityDelta.php b/data/VTEntityDelta.php
index 431ece2d127591cb41242091835ec3b9bf3c977a..1dfd40951c9f2c240ae8b9eab6c9840824214d02 100644
--- a/data/VTEntityDelta.php
+++ b/data/VTEntityDelta.php
@@ -112,28 +112,19 @@ class VTEntityDelta extends VTEventHandler {
 		if(empty(self::$oldEntity[$moduleName][$recordId])) {
 			return false;
 		}
-
-		$fieldDelta = isset(self::$entityDelta[$moduleName][$recordId][$fieldName]) ? self::$entityDelta[$moduleName][$recordId][$fieldName] :' ';
-		if(is_array($fieldDelta) && isset($fieldDelta['oldValue']) && isset($fieldDelta['currentValue'])) {
-
 		if (!array_key_exists($fieldName, self::$entityDelta[$moduleName][$recordId])) {
 			return false;
 		}
 		$fieldDelta = self::$entityDelta[$moduleName][$recordId][$fieldName];
 		if(is_array($fieldDelta)) {
-
 			$fieldDelta = array_map('decode_html', $fieldDelta);
-			$result = $fieldDelta['oldValue'] != $fieldDelta['currentValue'];
-			if ($fieldValue !== NULL) {
-				$result = $result && ($fieldDelta['currentValue'] === $fieldValue);
-			}
-			return $result;
 		}
-		else{
-			return;
+		$result = $fieldDelta['oldValue'] != $fieldDelta['currentValue'];
+		if ($fieldValue !== NULL) {
+			$result = $result && ($fieldDelta['currentValue'] === $fieldValue);
 		}
+		return $result;
+		}
+	
 	}
-
-}
-}
 ?>
diff --git a/include/ListView/ListViewSession.php b/include/ListView/ListViewSession.php
index eaa6f46203b8b5bd754b3724891df0855099dc91..790aab9424c8c73ab322a76ea79456dd431546aa 100644
--- a/include/ListView/ListViewSession.php
+++ b/include/ListView/ListViewSession.php
@@ -75,6 +75,7 @@ class ListViewSession {
 		}
 		$cv = new CustomView();
 		$viewId = $cv->getViewId($currentModule);
+		$recordNavigationInfo = array();
 		if(!empty($_SESSION[$currentModule.'_DetailView_Navigation'.$viewId])){
 			$recordNavigationInfo = Zend_Json::decode($_SESSION[$currentModule.'_DetailView_Navigation'.$viewId]);
 			$pageNumber =0;
diff --git a/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl b/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl
index b18eac1fd39a3562fc84124fef2c222763757f7c..dea10cf2bb9f9de46f2dfd1a372970e0ff97b513 100644
--- a/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl
+++ b/layouts/v7/modules/Vtiger/ComposeEmailForm.tpl
@@ -171,7 +171,7 @@
                     </div>         
                     <div class="row templateContent">
                         <div class="col-lg-12">
-                            <textarea style="width:390px;height:200px;" id="description" name="description">{isset($DESCRIPTION) ? $DESCRIPTION : ''}</textarea>
+                            <textarea style="width:390px;height:200px;" id="description" name="description">{$DESCRIPTION}</textarea>
                         </div>
                     </div>
                     
diff --git a/layouts/v7/modules/Vtiger/OverlayEditView.tpl b/layouts/v7/modules/Vtiger/OverlayEditView.tpl
index 05e9c29eac5f6007411c7b25b98f4138d3d59cdf..e7790c9f4e2524857858ba5ebce467601ce6b506 100644
--- a/layouts/v7/modules/Vtiger/OverlayEditView.tpl
+++ b/layouts/v7/modules/Vtiger/OverlayEditView.tpl
@@ -13,7 +13,12 @@
 
 <div class='fc-overlay-modal modal-content overlayEdit'>
     <div class="overlayHeader">
-        {assign var=TITLE value="{vtranslate('LBL_EDITING', $MODULE)} {vtranslate(isset($SINGLE_MODULE_NAME)? $SINGLE_MODULE_NAME : '', $MODULE)} - {$RECORD_STRUCTURE_MODEL->getRecordName()}"} 
+    {if isset($SINGLE_MODULE_NAME)}
+        {assign var="singleModuleName" value=$SINGLE_MODULE_NAME}
+      {else}
+        {assign var="singleModuleName" value=""}
+      {/if}
+          {assign var=TITLE value="{vtranslate('LBL_EDITING', $MODULE)} {vtranslate($singleModuleName, $MODULE)} - {$RECORD_STRUCTURE_MODEL->getRecordName()}"}  
         {include file="ModalHeader.tpl"|vtemplate_path:$MODULE}
     </div>
     <form class="form-horizontal recordEditView" id="EditView" name="edit" method="post" action="index.php" enctype="multipart/form-data">