diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index 0f49f6640..b2b2cc524 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -1,20 +1,7 @@
 <?php
-/**
- * Copyright (C) 2013-2021 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
+/*
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
 /**
@@ -2434,17 +2421,21 @@ abstract class DBObject implements iDisplay
 	 *         Reset during {@see DBObject::DBUpdate()}
 	 * @throws Exception
 	 * @uses m_aCurrValues
-     */
+	 */
 	public function ListChanges()
 	{
-		if ($this->m_bIsInDB)
-		{
+		if ($this->m_bIsInDB) {
 			return $this->ListChangedValues($this->m_aCurrValues);
 		}
 
 		return $this->m_aCurrValues;
 	}
 
+	public function GetCurrentValues()
+	{
+		return $this->m_aCurrValues;
+	}
+
 	/**
 	 * @api
 	 * @api-advanced
diff --git a/sources/Controller/AjaxRenderController.php b/sources/Controller/AjaxRenderController.php
index e22932aed..377f417b2 100644
--- a/sources/Controller/AjaxRenderController.php
+++ b/sources/Controller/AjaxRenderController.php
@@ -313,13 +313,10 @@ class AjaxRenderController
 		$aResult["data"] = [];
 		while ($aObject = $oSet->FetchAssoc()) {
 			foreach ($aClassAliases as $sAlias => $sClass) {
-				if (isset($aColumns[$sAlias])) {
-					foreach ($aColumns[$sAlias] as $sAttCode => $oAttDef) {
-						if ($sAttCode == "_key_") {
-							$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetKey();
-						} else {
-							$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetAsHTML($sAttCode);
-						}
+				if (isset($aObject[$sAlias])) {
+					$aObj[$sAlias."/_key_"] = $aObject[$sAlias]->GetKey();
+					foreach ($aObject[$sAlias]->GetCurrentValues() as $sAttCode => $oAttDef) {
+						$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetAsHTML($sAttCode);
 					}
 				}
 			}