diff --git a/sources/Application/Search/CriterionConversion/criteriontooql.class.inc.php b/sources/Application/Search/CriterionConversion/criteriontooql.class.inc.php
index bfd291e7f..a3f61b8f5 100644
--- a/sources/Application/Search/CriterionConversion/criteriontooql.class.inc.php
+++ b/sources/Application/Search/CriterionConversion/criteriontooql.class.inc.php
@@ -119,8 +119,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		$aValues = self::GetValues($aCriteria);
 		$sValue = self::GetValue($aValues, 0);
 
-		if (!strlen($sValue))
-		{
+		if (!Utils::StrLen($sValue)) {
 			return "1";
 		}
 
@@ -132,8 +131,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		$aValues = self::GetValues($aCriteria);
 		$sValue = self::GetValue($aValues, 0);
 
-		if (!strlen($sValue))
-		{
+		if (!Utils::StrLen($sValue)) {
 			return "1";
 		}
 
@@ -145,8 +143,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		$aValues = self::GetValues($aCriteria);
 		$sValue = self::GetValue($aValues, 0);
 
-		if (!strlen($sValue))
-		{
+		if (!Utils::StrLen($sValue)) {
 			return "1";
 		}
 
@@ -162,8 +159,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 			return "({$sRef} = '0')";
 		}
 
-		if (!strlen($sValue) && (!(isset($aCriteria['has_undefined'])) || !($aCriteria['has_undefined'])))
-		{
+		if (!Utils::StrLen($sValue) && (!(isset($aCriteria['has_undefined'])) || !($aCriteria['has_undefined']))) {
 			return "1";
 		}
 
@@ -175,8 +171,7 @@ class CriterionToOQL extends CriterionConversionAbstract
 		$aValues = self::GetValues($aCriteria);
 		$sValue = self::GetValue($aValues, 0);
 
-		if (!strlen($sValue))
-		{
+		if (!Utils::StrLen($sValue)) {
 			return "1";
 		}
 
@@ -191,12 +186,9 @@ class CriterionToOQL extends CriterionConversionAbstract
 		for($i = 0; $i < count($aValues); $i++)
 		{
 			$sRawValue = self::GetValue($aValues, $i);
-			if (strlen($sRawValue) == 0)
-			{
+			if (!Utils::StrLen($sRawValue)) {
 				$bHasUnDefined = true;
-			}
-			else
-			{
+			} else {
 				$aRawValues[] = $sRawValue;
 			}
 		}