diff --git a/include/QueryGenerator/EnhancedQueryGenerator.php b/include/QueryGenerator/EnhancedQueryGenerator.php
index 8584b4d56..e0dcfcdfe 100644
--- a/include/QueryGenerator/EnhancedQueryGenerator.php
+++ b/include/QueryGenerator/EnhancedQueryGenerator.php
@@ -674,7 +674,11 @@ public function getWhereClause() {
 						$columnSql = getSqlForNameInDisplayFormat(array('last_name'=>$columnSqlTable.'.last_name',
 																		'first_name'=>$columnSqlTable.'.first_name'),'Users');
 					} else if(in_array('DocumentFolders', $moduleList)) {
-						$columnSql = "vtiger_attachmentsfolder".$fieldName.".foldername";
+						if($conditionInfo['operator'] == 'e' || $conditionInfo['operator'] == 'n') {
+							$columnSql = "vtiger_attachmentsfolder".$fieldName.".folderid";
+						} else {
+							$columnSql = "vtiger_attachmentsfolder".$fieldName.".foldername";
+						}
 					} else if(in_array('Currency', $moduleList)) {
 						$columnSql = "vtiger_currency_info$parentReferenceField$fieldName.currency_name";
 						if($fieldName == 'currency_id' && is_numeric($conditionInfo['value'])){
diff --git a/layouts/v7/modules/Vtiger/resources/Field.js b/layouts/v7/modules/Vtiger/resources/Field.js
index f51ca2a0e..63fb215fe 100644
--- a/layouts/v7/modules/Vtiger/resources/Field.js
+++ b/layouts/v7/modules/Vtiger/resources/Field.js
@@ -308,6 +308,12 @@ Vtiger_Field_Js('Vtiger_Documentsfolder_Field_Js',{},{
 	 * @return - select element and chosen element
 	 */
 	getUi : function() {
+		// リストの条件によって表示を変える
+		if(this.get('comparatorElementVal') != 'e' && this.get('comparatorElementVal') != 'n') {
+			var html = '<input class="inputElement" type="text" name="'+ this.getName() +'" value="'+ this.getValue() + '" />';
+			return jQuery(html);
+		}
+
 		//added class inlinewidth
 		var html = '<select class="select2 inputElement inlinewidth" name="'+ this.getName() +'" id="field_'+this.getModuleName()+'_'+this.getName()+'">';
 		var pickListValues = this.getPickListValues();