diff --git a/core/dbobjectsearch.class.php b/core/dbobjectsearch.class.php
index 68573503a5..6ad755a3e0 100644
--- a/core/dbobjectsearch.class.php
+++ b/core/dbobjectsearch.class.php
@@ -1815,7 +1815,7 @@ class DBObjectSearch extends DBSearch
 		if ($bIsOnQueriedClass)
 		{
 			// default to the whole list of attributes + the very std id/finalclass
-			$oBuild->m_oQBExpressions->AddSelect($sClassAlias.$sKeyField, new FieldExpression($sKeyField, $sClassAlias));
+			$oBuild->m_oQBExpressions->AddSelect($sClassAlias.'id', new FieldExpression('id', $sClassAlias));
 			if (is_null($aAttToLoad) || !array_key_exists($sClassAlias, $aAttToLoad))
 			{
 				$sSelectedClass = $oBuild->GetSelectedClass($sClassAlias);
diff --git a/core/trigger.class.inc.php b/core/trigger.class.inc.php
index 792d80fde4..593115ecec 100644
--- a/core/trigger.class.inc.php
+++ b/core/trigger.class.inc.php
@@ -548,7 +548,7 @@ class lnkTriggerAction extends cmdbAbstractObject
 			"state_attcode" => "",
 			"reconc_keys" => array('action_id', 'trigger_id'),
 			"db_table" => "priv_link_action_trigger",
-			"db_key_field" => "id",
+			"db_key_field" => "link_id",
 			"db_finalclass_field" => "",
 			"display_template" => "",
 			"is_link" => true,