diff --git a/core/legacy/dbobjectsearchlegacy.class.php b/core/legacy/dbobjectsearchlegacy.class.php
index b131ac6c0..8815adc69 100644
--- a/core/legacy/dbobjectsearchlegacy.class.php
+++ b/core/legacy/dbobjectsearchlegacy.class.php
@@ -26,14 +26,15 @@ define('ENABLE_OPT', true);
  * A search over a DBObject
  *
  * This is the most common search cases, the other class representing a search is DBUnionSearch.
- * For clarity purpose, since only the constructor vary between DBObjectSearch and DBUnionSearch, all the API is documented on the common ancestor: DBSearch
- * Please refer to DBSearch's documentation
+ * For clarity purpose, since only the constructor vary between DBObjectSearch and DBUnionSearch, all the API is documented on the common
+ * ancestor: DBSearch Please refer to DBSearch's documentation
  *
- * @package     iTopORM
- * @phpdoc-tuning-exclude-inherited this tag prevent PHPdoc from displaying inherited methods. This is done in order to force the API doc. location into DBSearch only.
  * @api
  * @see DBSearch
  * @see DBUnionSearch
+ * @package     iTopORM
+ * @phpdoc-tuning-exclude-inherited this tag prevent PHPdoc from displaying inherited methods. This is done in order to force the API doc.
+ *     location into DBSearch only.
  */
 class DBObjectSearch extends DBSearch
 {
@@ -2213,6 +2214,10 @@ class DBObjectSearch extends DBSearch
 					if (array_key_exists($sAttCode.$sColId, $aExpectedAtts))
 					{
 						$oFieldSQLExp = new FieldExpressionResolved($sSQLExpr, $sTableAlias);
+						/**
+						 * @var string $sPluginClass
+						 * @var iQueryModifier $oQueryModifier
+						 */
 						foreach (MetaModel::EnumPlugins('iQueryModifier') as $sPluginClass => $oQueryModifier)
 						{
 							$oFieldSQLExp = $oQueryModifier->GetFieldExpression($oBuild, $sTargetClass, $sAttCode, $sColId, $oFieldSQLExp, $oSelectBase);
diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index da7b58006..2fb621853 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -4163,6 +4163,10 @@ abstract class MetaModel
 		// Compute query modifiers properties (can be set in the search itself, by the context, etc.)
 		//
 		$aModifierProperties = array();
+		/**
+		 * @var string $sPluginClass
+		 * @var iQueryModifier $oQueryModifier
+		 */
 		foreach(MetaModel::EnumPlugins('iQueryModifier') as $sPluginClass => $oQueryModifier)
 		{
 			// Lowest precedence: the application context
diff --git a/core/sqlobjectquerybuilder.class.inc.php b/core/sqlobjectquerybuilder.class.inc.php
index 8390bb071..48416f22c 100644
--- a/core/sqlobjectquerybuilder.class.inc.php
+++ b/core/sqlobjectquerybuilder.class.inc.php
@@ -242,6 +242,10 @@ class SQLObjectQueryBuilder
 					$oBuild->m_oQBExpressions->AddSelect($sSelectedClassAlias.$sAttCode.$sColId, new FieldExpression($sAttCode.$sColId, $sClassAlias));
 				}
 				$oFieldSQLExp = new FieldExpressionResolved($sSQLExpr, $sClassAlias);
+				/**
+				 * @var string $sPluginClass
+				 * @var iQueryModifier $oQueryModifier
+				 */
 				foreach (MetaModel::EnumPlugins('iQueryModifier') as $sPluginClass => $oQueryModifier)
 				{
 					$oFieldSQLExp = $oQueryModifier->GetFieldExpression($oBuild, $sClass, $sAttCode, $sColId, $oFieldSQLExp, $oBaseSQLQuery);