diff --git a/core/modelreflection.class.inc.php b/core/modelreflection.class.inc.php
index 3ab1ed7cf..7b3b7be09 100644
--- a/core/modelreflection.class.inc.php
+++ b/core/modelreflection.class.inc.php
@@ -151,7 +151,8 @@ class ModelReflectionRuntime extends ModelReflection
 		$aAttributes = array();
 		foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
 		{
-			$sAttributeClass = get_class($oAttDef);
+			$oReflection = new ReflectionClass($oAttDef);
+			$sAttributeClass = $oReflection->getShortName();
 			if ($aScope != null)
 			{
 				foreach ($aScope as $sScopeClass)
diff --git a/sources/Forms/Block/DataModel/OqlFormBlock.php b/sources/Forms/Block/DataModel/OqlFormBlock.php
index 37e3c748d..53097773e 100644
--- a/sources/Forms/Block/DataModel/OqlFormBlock.php
+++ b/sources/Forms/Block/DataModel/OqlFormBlock.php
@@ -10,7 +10,6 @@ use Combodo\iTop\Forms\Block\Base\TextAreaFormBlock;
 use Combodo\iTop\Forms\Block\FormType\OqlFormType;
 use Combodo\iTop\Forms\Block\IO\Converter\OqlToClassConverter;
 use Combodo\iTop\Forms\Block\IO\Format\ClassIOFormat;
-use Combodo\iTop\Forms\Block\IO\Format\StringIOFormat;
 
 /**
  * Form block for oql expression.
@@ -21,7 +20,6 @@ class OqlFormBlock extends TextAreaFormBlock
 {
 	// outputs
 	public const OUTPUT_SELECTED_CLASS = 'selected_class';
-	public const OUTPUT_OQL = 'oql';
 
 	/** @inheritdoc */
 	public function GetFormType(): string
@@ -34,7 +32,6 @@ class OqlFormBlock extends TextAreaFormBlock
 	{
 		parent::InitOutputs();
 		$this->AddOutput(self::OUTPUT_SELECTED_CLASS, ClassIOFormat::class, new OqlToClassConverter());
-		$this->AddOutput(self::OUTPUT_OQL, StringIOFormat::class);
 	}
 
 	/** @inheritdoc */