diff --git a/inc/inc.Language.php b/inc/inc.Language.php
index 78cfb3397..430eca99d 100644
--- a/inc/inc.Language.php
+++ b/inc/inc.Language.php
@@ -333,6 +333,66 @@ function getOverallStatusText($status) { /* {{{ */
 	}
 } /* }}} */
 
+function getAttributeTypeText($attrdef) { /* {{{ */
+	switch($attrdef->getType()) {
+		case SeedDMS_Core_AttributeDefinition::type_int:
+			$t = getMLText("attrdef_type_int");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_float:
+			$t = getMLText("attrdef_type_float");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_string:
+			$t = getMLText("attrdef_type_string");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_boolean:
+			$t = getMLText("attrdef_type_boolean");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_date:
+			$t = getMLText("attrdef_type_date");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_email:
+			$t = getMLText("attrdef_type_email");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_url:
+			$t = getMLText("attrdef_type_url");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_boolean:
+			$t = getMLText("attrdef_type_boolean");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_folder:
+			$t = getMLText("attrdef_type_folder");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_document:
+			$t = getMLText("attrdef_type_document");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_user:
+			$t = getMLText("attrdef_type_user");
+			break;
+		case SeedDMS_Core_AttributeDefinition::type_group:
+			$t = getMLText("attrdef_type_group");
+			break;
+	}
+	return $t;
+} /* }}} */
+
+function getAttributeObjectTypeText($attrdef) { /* {{{ */
+	switch($attrdef->getObjType()) {
+		case SeedDMS_Core_AttributeDefinition::objtype_all:
+			$ot = getMLText("all");
+			break;
+		case SeedDMS_Core_AttributeDefinition::objtype_folder:
+			$ot = getMLText("folder");
+			break;
+		case SeedDMS_Core_AttributeDefinition::objtype_document:
+			$ot = getMLText("document");
+			break;
+		case SeedDMS_Core_AttributeDefinition::objtype_documentcontent:
+			$ot = getMLText("documentcontent");
+			break;
+	}
+	return $ot;
+} /* }}} */
+
 function getAttributeValidationText($error, $attrname='', $attrvalue='', $regex='') { /* {{{ */
 	$arr = getAttributeValidationError($error, $attrname, $attrvalue, $regex);
 
diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 0702d6b7a..c0b615a0c 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -347,58 +347,8 @@ $(document).ready( function() {
 <?php
 		if($attrdefs) {
 			foreach ($attrdefs as $attrdef) {
-				switch($attrdef->getObjType()) {
-					case SeedDMS_Core_AttributeDefinition::objtype_all:
-						$ot = getMLText("all");
-						break;
-					case SeedDMS_Core_AttributeDefinition::objtype_folder:
-						$ot = getMLText("folder");
-						break;
-					case SeedDMS_Core_AttributeDefinition::objtype_document:
-						$ot = getMLText("document");
-						break;
-					case SeedDMS_Core_AttributeDefinition::objtype_documentcontent:
-						$ot = getMLText("documentcontent");
-						break;
-				}
-				switch($attrdef->getType()) {
-					case SeedDMS_Core_AttributeDefinition::type_int:
-						$t = getMLText("attrdef_type_int");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_float:
-						$t = getMLText("attrdef_type_float");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_string:
-						$t = getMLText("attrdef_type_string");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_boolean:
-						$t = getMLText("attrdef_type_boolean");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_date:
-						$t = getMLText("attrdef_type_date");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_email:
-						$t = getMLText("attrdef_type_email");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_url:
-						$t = getMLText("attrdef_type_url");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_boolean:
-						$t = getMLText("attrdef_type_boolean");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_folder:
-						$t = getMLText("attrdef_type_folder");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_document:
-						$t = getMLText("attrdef_type_document");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_user:
-						$t = getMLText("attrdef_type_user");
-						break;
-					case SeedDMS_Core_AttributeDefinition::type_group:
-						$t = getMLText("attrdef_type_group");
-						break;
-				}
+				$ot = getAttributeObjectTypeText($attrdef);
+				$t = getAttributeTypeText($attrdef);
 				print "<option value=\"".$attrdef->getID()."\" ".($selattrdef && $attrdef->getID()==$selattrdef->getID() ? 'selected' : '')." data-subtitle=\"".htmlspecialchars($ot.", ".$t)."\">" . htmlspecialchars($attrdef->getName()/* ." (".$ot.", ".$t.")"*/);
 			}
 		}
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index a6101cd3e..631f7b31f 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -677,7 +677,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 												echo "<option value=\"".$rec->getID()."\"";
 												if(in_array($rec->getID(), $selections))
 													echo " selected";
-												echo ">".htmlspecialchars($rec->getName())."</option>";
+												echo " data-subtitle=\"".htmlspecialchars(getAttributeObjectTypeText($rec).", ".getAttributeTypeText($rec))."\">".htmlspecialchars($rec->getName())."</option>";
 											}
 											echo "</select>";
 										} else {