diff --git a/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php b/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
index d9f90b4f6..b4800c149 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Controller/ObjectController.php
@@ -639,14 +639,8 @@ class ObjectController extends BrickController
 		$oSet = new DBObjectSet($oSearch, array(), array('this' => $oHostObject, 'ac_query' => '%'.$sQuery.'%'));
 		$oSet->OptimizeColumnLoad(array($oSearch->GetClassAlias() => array('friendlyname')));
 		// Note : This limit is also used in the field renderer by typeahead to determine how many suggestions to display
-		if ($oTargetAttDef->GetEditClass() === 'CustomFields')
-		{
-			$oSet->SetLimit(static::DEFAULT_LIST_LENGTH);
-		}
-		else
-		{
-			$oSet->SetLimit($oTargetAttDef->GetMaximumComboLength()); // TODO : Is this the right limit value ? We might want to use another parameter
-		}
+		$oSet->SetLimit(static::DEFAULT_LIST_LENGTH);
+
 		// - Retrieving objects
 		while ($oItem = $oSet->Fetch())
 		{
diff --git a/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php
index 2263e1340..6e95ad7a8 100644
--- a/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php
@@ -176,7 +176,7 @@ EOF
 					// - Opening input group
 					$oOutput->AddHtml('<div class="input-group selectobject">');
 					// - Rendering autocomplete search
-					$oOutput->AddHtml('<input type="text" id="' . $sAutocompleteFieldId . '" name="' . $sAutocompleteFieldId . '" value="')->AddHtml($sFieldValue)->AddHtml('" data-target-id="' . $this->oField->GetGlobalId() . ' "class="form-control" />');
+					$oOutput->AddHtml('<input type="text" id="' . $sAutocompleteFieldId . '" name="' . $sAutocompleteFieldId . '" value="')->AddHtml($sFieldValue)->AddHtml('" data-target-id="' . $this->oField->GetGlobalId() . '" class="form-control" />');
 					$oOutput->AddHtml('<input type="hidden" id="' . $this->oField->GetGlobalId() . '" name="' . $this->oField->GetId() . '" value="' . $this->oField->GetCurrentValue() . '" />');
 					// - Rendering buttons
 					//   - Rendering hierarchy button
@@ -207,14 +207,15 @@ EOF
 							// Updating autocomplete field
 							me.element.find('#{$this->oField->GetGlobalId()}').val(sItemId);
 							me.element.find('#{$sAutocompleteFieldId}').val(sItemName);
-							oAutocompleteSource_{$this->oField->GetId()}.index.datums[sItemId] = {id: sItemId, name: sItemName};
+							oAutocompleteSource_{$this->oField->GetId()}.index.datums[sItemId] = {id: sItemId, name: sItemName};							
+							$('#$sAutocompleteFieldId').typeahead('val', sItemName);							
 //console.log('callback', oData);
 							// Triggering field change event
 							me.element.closest(".field_set").trigger("field_change", {
 								id: me.element.find('#{$this->oField->GetGlobalId()}').attr("id"),
 								name: me.element.find('#{$this->oField->GetGlobalId()}').attr("name"),
 								value: me.element.find('#{$this->oField->GetGlobalId()}').val()
-							});
+							});							
 						}
 					});
 EOF
@@ -426,7 +427,7 @@ JS
 						},
 					},
 				};
-			
+
 				if($('.modal[data-source-element="{$sSearchButtonId}"]').length === 0)
 				{
 					oOptions['attributes'] = {'data-source-element': '{$sSearchButtonId}'};