diff --git a/core/valuesetdef.class.inc.php b/core/valuesetdef.class.inc.php
index e9846f77d..41a88dd78 100644
--- a/core/valuesetdef.class.inc.php
+++ b/core/valuesetdef.class.inc.php
@@ -202,10 +202,13 @@ class ValueSetObjects extends ValueSetDefinition
 			}
 		}
 
-		$oValueExpr = new ScalarExpression('%'.$sContains.'%');
-		$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
-		$oNewCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
-		$oFilter->AddConditionExpression($oNewCondition);
+		if (!empty($sContains))
+		{
+			$oValueExpr = new ScalarExpression('%'.$sContains.'%');
+			$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
+			$oNewCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
+			$oFilter->AddConditionExpression($oNewCondition);
+		}
 
 		$oObjects = new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs);
 		while ($oObject = $oObjects->Fetch())