diff --git a/dictionaries/cs.dictionary.itop.ui.php b/dictionaries/cs.dictionary.itop.ui.php
index 33e1c87f53..833886d643 100755
--- a/dictionaries/cs.dictionary.itop.ui.php
+++ b/dictionaries/cs.dictionary.itop.ui.php
@@ -721,6 +721,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
     'UI:LinksWidget:Autocomplete+' => 'Zadejte první tři znaky...',
     'UI:Edit:TestQuery' => 'Otestovat dotaz',
     'UI:Combo:SelectValue' => '--- vyberte hodnotu ---',
diff --git a/dictionaries/da.dictionary.itop.ui.php b/dictionaries/da.dictionary.itop.ui.php
index b527427fb1..059dc41a8b 100644
--- a/dictionaries/da.dictionary.itop.ui.php
+++ b/dictionaries/da.dictionary.itop.ui.php
@@ -563,6 +563,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => '',
 	'UI:Edit:TestQuery' => 'Test forespørgsel',
 	'UI:Combo:SelectValue' => '--- vælg en værdi ---',
diff --git a/dictionaries/de.dictionary.itop.ui.php b/dictionaries/de.dictionary.itop.ui.php
index 527c8c44c7..d8d15c7ed8 100644
--- a/dictionaries/de.dictionary.itop.ui.php
+++ b/dictionaries/de.dictionary.itop.ui.php
@@ -564,6 +564,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => 'Geben Sie die ersten 3 Buchstaben ein...',
 	'UI:Edit:TestQuery' => 'Query testen',
 	'UI:Combo:SelectValue' => '--- wählen Sie einen Wert ---',
diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php
index d361ec0c00..24b91f9e1e 100644
--- a/dictionaries/en.dictionary.itop.ui.php
+++ b/dictionaries/en.dictionary.itop.ui.php
@@ -725,6 +725,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => 'Type the first 3 characters...',
 	'UI:Edit:TestQuery' => 'Test query',
 	'UI:Combo:SelectValue' => '--- select a value ---',
diff --git a/dictionaries/es_cr.dictionary.itop.ui.php b/dictionaries/es_cr.dictionary.itop.ui.php
index e7d6d7cef7..fcde31fc40 100644
--- a/dictionaries/es_cr.dictionary.itop.ui.php
+++ b/dictionaries/es_cr.dictionary.itop.ui.php
@@ -722,6 +722,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => 'Escriba los primeros 3 caracteres...',
 	'UI:Edit:TestQuery' => 'Consulta de Prueba',
 	'UI:Combo:SelectValue' => '--- seleccione un valor ---',
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 0bf64c3d57..908f9de97e 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -616,6 +616,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label',
 	'UI:Schema:DisplaySelector/Code' => 'Code',
 	'UI:Schema:Attribute/Filter' => 'Filtre',
+	'UI:Schema:DefaultNullValue' => 'Valeur null par défaut : "%1$s"',
 	'UI:LinksWidget:Autocomplete+' => 'Tapez les 3 premiers caractères...',
 	'UI:Edit:TestQuery' => 'Tester la requête',
 	'UI:Combo:SelectValue' => '--- choisissez une valeur ---',
diff --git a/dictionaries/hu.dictionary.itop.ui.php b/dictionaries/hu.dictionary.itop.ui.php
index 5cbab10db6..5e4f862ef4 100755
--- a/dictionaries/hu.dictionary.itop.ui.php
+++ b/dictionaries/hu.dictionary.itop.ui.php
@@ -495,6 +495,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => '',
 	'UI:Combo:SelectValue' => '--- válasszon értéket ---',
 	'UI:Label:SelectedObjects' => 'Kiválasztott objektumok: ',
diff --git a/dictionaries/it.dictionary.itop.ui.php b/dictionaries/it.dictionary.itop.ui.php
index 53d845a54a..11c3b784fb 100644
--- a/dictionaries/it.dictionary.itop.ui.php
+++ b/dictionaries/it.dictionary.itop.ui.php
@@ -627,6 +627,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => '',
 	'UI:Combo:SelectValue' => '--- seleziona un valore ---',
 	'UI:Label:SelectedObjects' => 'oggetti selezionati: ',
diff --git a/dictionaries/ja.dictionary.itop.ui.php b/dictionaries/ja.dictionary.itop.ui.php
index 2c814205fc..1a4390e9c0 100644
--- a/dictionaries/ja.dictionary.itop.ui.php
+++ b/dictionaries/ja.dictionary.itop.ui.php
@@ -563,6 +563,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => '最初の3文字をタイプしてください...',
 	'UI:Edit:TestQuery' => 'Test query',
 	'UI:Combo:SelectValue' => '--- 値を選んでください ---',
diff --git a/dictionaries/nl.dictionary.itop.ui.php b/dictionaries/nl.dictionary.itop.ui.php
index da49ae2636..599a554579 100644
--- a/dictionaries/nl.dictionary.itop.ui.php
+++ b/dictionaries/nl.dictionary.itop.ui.php
@@ -722,6 +722,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => 'Typ de eerste 3 karakters...',
 	'UI:Edit:TestQuery' => 'Test query',
 	'UI:Combo:SelectValue' => '--- selecteer een waarde ---',
diff --git a/dictionaries/pt_br.dictionary.itop.ui.php b/dictionaries/pt_br.dictionary.itop.ui.php
index db11046289..f3d72a16f6 100644
--- a/dictionaries/pt_br.dictionary.itop.ui.php
+++ b/dictionaries/pt_br.dictionary.itop.ui.php
@@ -714,6 +714,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => 'Tipo os 3 primeiro caracteres...',
 	'UI:Edit:TestQuery' => 'Testar consulta',
 	'UI:Combo:SelectValue' => '--- selecione um valor ---',
diff --git a/dictionaries/ru.dictionary.itop.ui.php b/dictionaries/ru.dictionary.itop.ui.php
index c8af7ff5fb..ae1f273e27 100644
--- a/dictionaries/ru.dictionary.itop.ui.php
+++ b/dictionaries/ru.dictionary.itop.ui.php
@@ -696,6 +696,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => 'Введите первые 3 символа...',
 	'UI:Edit:TestQuery' => 'Проверить запрос',
 	'UI:Combo:SelectValue' => '--- выбор значения ---',
diff --git a/dictionaries/tr.dictionary.itop.ui.php b/dictionaries/tr.dictionary.itop.ui.php
index aae331517a..2080a4a2a0 100644
--- a/dictionaries/tr.dictionary.itop.ui.php
+++ b/dictionaries/tr.dictionary.itop.ui.php
@@ -601,6 +601,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => 'İlk 3 karakteri giriniz...',
 	'UI:Combo:SelectValue' => '--- değer seçiniz ---',
 	'UI:Label:SelectedObjects' => 'Seçilen nesneler: ',
diff --git a/dictionaries/zh.dictionary.itop.ui.php b/dictionaries/zh.dictionary.itop.ui.php
index e0aec0a7ac..ec720bfb41 100644
--- a/dictionaries/zh.dictionary.itop.ui.php
+++ b/dictionaries/zh.dictionary.itop.ui.php
@@ -600,6 +600,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Schema:DisplaySelector/Label' => 'Label~~',
 	'UI:Schema:DisplaySelector/Code' => 'Code~~',
 	'UI:Schema:Attribute/Filter' => 'Filter~~',
+	'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~',
 	'UI:LinksWidget:Autocomplete+' => '输入前3个字符...',
 	'UI:Combo:SelectValue' => '--- 选择一个值 ---',
 	'UI:Label:SelectedObjects' => '被选对象: ',
diff --git a/pages/schema.php b/pages/schema.php
index ea8ee8a349..680700f2e5 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -221,6 +221,30 @@ function DisplayClassesList($oPage, $sContext)
 
     $oPage->add("<label for='search-model'>" . Dict::S('UI:Schema:ClassFilter') ."</label><input id='search-model'/> ");
 	$oPage->add("<ul id=\"ClassesList\" class=\"treeview fileview\">\n");
+	$oPage->add_ready_script(
+		<<<EOF
+        $("#search-model").result(function(){
+		   	$(this).trigger(jQuery.Event('input'));
+		});
+		$("#search-model").on('input', function() {
+			var search_result = [];
+			$("#ClassesList").find("li").each(function(){
+				if( ! ~$(this).children("a").text().toLowerCase().indexOf($("#search-model").val().toLowerCase())){
+					$(this).hide();
+				}
+				else{
+					search_result.push($(this));
+				}
+			});
+			search_result.forEach(function(e){
+				e.show();
+				e.find('ul > li').show();
+				e.parents().show();
+			});
+		});
+EOF
+
+	);
 	// Get all the "root" classes for display
 	$aRootClasses = array();
 	foreach(MetaModel::GetClasses() as $sClassName)
@@ -716,7 +740,7 @@ function DisplayClassDetails($oPage, $sClass, $sContext)
         $aOrigins[$sOrigin] = true;
         $sAllowedValues = "";
 		$sMoreInfo = "";
-
+		$sDefaultNullValue = "";
 		$aCols = array();
 		foreach($oAttDef->GetSQLColumns() as $sCol => $sFieldDesc)
 		{
@@ -726,7 +750,19 @@ function DisplayClassDetails($oPage, $sClass, $sContext)
 		{
 
 			$aMoreInfo = array();
-			$aMoreInfo[] = $oAttDef->IsNullAllowed() ? Dict::S('UI:Schema:NullAllowed') : Dict::S('UI:Schema:NullNotAllowed');
+			if($oAttDef->IsNullAllowed())
+			{
+				$aMoreInfo[] = Dict::S('UI:Schema:NullAllowed');
+				$sDefaultNullValue = ($oAttDef->GetNullValue() !== null ? Dict::Format('UI:Schema:DefaultNullValue', $oAttDef->GetNullValue()) : "" );
+			}
+			else
+			{
+				$aMoreInfo[] = Dict::S('UI:Schema:NullNotAllowed');
+			}
+			if($oAttDef->GetDefaultValue())
+			{
+				$aMoreInfo[] = Dict::Format("UI:Schema:Default_Description", $oAttDef->GetDefaultValue());
+			}
 			$sMoreInfo .= implode(', ', $aMoreInfo);
 		}
         $sAttrCode = $oAttDef->GetCode();
@@ -765,7 +801,7 @@ function DisplayClassDetails($oPage, $sClass, $sContext)
 							'origincolor' => "<span class=\"originColor" . $sOrigin ."\"></span>",
             				'origin' => "<span id=\"origin" . $sAttrCode ."\">$sOrigin</span>",
 							'values' => $sAllowedValues,
-							'moreinfo' => $sMoreInfo);
+							'moreinfo' => "<span id=\"moreinfo" . $sAttrCode . "\"> $sMoreInfo</span>");
 		//tooltip construction
         $oPage->add_ready_script(
             <<<EOF
@@ -781,6 +817,9 @@ function DisplayClassDetails($oPage, $sClass, $sContext)
 				if( !$sIsEnumValues && '$sAllowedValuesEscpd' != ''){
 					$('#values$sAttrCode').qtip( { content: '$sAllowedValuesEscpd', show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
 				}
+				if('$sDefaultNullValue' != ''){
+					$('#moreinfo$sAttrCode').parent().qtip( { content: '$sDefaultNullValue', show: 'mouseover', hide: {fixed : true, delay : 500}, style: { name: 'dark', tip: 'leftTop' }, position: { corner: { target: 'rightMiddle', tooltip: 'leftTop' }} } );
+				}
 EOF
 
 		);
@@ -866,19 +905,19 @@ function DisplayGranularityDisplayer($oPage){
 					$('.attrCode').show();
 					$('.attrLabel').show();
 					$('.parenthesis').show();
-					$("#search-model").autocomplete(autocompleteClassLabelAndCode);
+					$("#search-model").autocomplete(autocompleteClassLabelAndCode, {scroll:true, matchContains:true});
 				break;
 				case 'label':
 					$('.attrCode').hide();
 					$('.attrLabel').show();
 					$('.parenthesis').hide();
-					$("#search-model").autocomplete(autocompleteClassLabel);
+					$("#search-model").autocomplete(autocompleteClassLabel, {scroll:true, matchContains:true});
 				break;
 				case 'code':
 					$('.attrCode').show();
 					$('.attrLabel').hide();
 					$('.parenthesis').hide();
-					$("#search-model").autocomplete(autocompleteClassCode);
+					$("#search-model").autocomplete(autocompleteClassCode, {scroll:true, matchContains:true});
 				break;
 			}
 			SetUserPreference("datamodel_viewer_display_granularity", $('#displaySelector').val(), true);
@@ -947,6 +986,12 @@ switch($operation)
 	//if we want to see class details & class is given then display it, otherwise act default (just show the class list)
 	if($sClass != '')
 	{
+		$oPage->add_ready_script(
+			<<<EOF
+$('#search-model').val('$sClass');
+$('#search-model').trigger("input");
+EOF
+);
 		DisplayClassDetails($oPage, $sClass, $sContext);
 		break;
 	}
@@ -963,21 +1008,6 @@ $oPage->add_ready_script(
 		west : {size: "20%", minSize : 200,paneSize : 600}
 		});
 		// Layout
-		   $("#search-model").result(function(){
-		   	$(this).trigger(jQuery.Event('input'));
-		   });
-			$("#search-model").on('input', function() {
-				$("#ClassesList").find("li").each(function(){
-					if( ! ~$(this).children("a").text().toLowerCase().indexOf($("#search-model").val().toLowerCase())){
-						$(this).hide();
-					}
-					else{
-						$(this).show();
-						$(this).parents().show();
-
-					}
-				});
-			});
 EOF
 
 );