diff --git a/CHANGELOG b/CHANGELOG
index 39807f031..f478520af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -183,6 +183,7 @@
 - new api to fulltext search
 - do offer to export users of group if there are no users
 - config file can be set in env var SEEDDMS_CONFIG_FILE
+- fix error when search for a boolean attribute value
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.20
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index b7dfdb5ef..6ec8a3d6e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1407,7 +1407,7 @@ $(document).ready(function() {
 		<p>'.getMLText('tree_loading').'</p>
   </div>
   <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
   </div>
 </div>
 ';
@@ -1473,7 +1473,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 		<p>'.getMLText('tree_loading').'</p>
   </div>
   <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
   </div>
 </div>
 ';
@@ -1570,8 +1570,8 @@ $(document).ready(function() {
 		<p><?php printMLText('categories_loading') ?></p>
   </div>
   <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
-    <button class="btn" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="fa fa-save"></i> <?php printMLText("save") ?></button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>
+    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true" onClick="acceptCategories();"><i class="fa fa-save"></i> <?php printMLText("save") ?></button>
   </div>
 </div>
 <?php
@@ -1705,8 +1705,9 @@ $(document).ready(function() {
 		$content = '';
 		switch($attrdef->getType()) {
 		case SeedDMS_Core_AttributeDefinition::type_boolean:
+			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
 			$content .= "<input type=\"hidden\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"\" />";
-			$content .= "<input type=\"checkbox\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".(($attribute && $attribute->getValue()) ? 'checked' : '')." />";
+			$content .= "<input type=\"checkbox\" id=\"".$fieldname."_".$attrdef->getId()."\" name=\"".$fieldname."[".$attrdef->getId()."]\" value=\"1\" ".($objvalue ? 'checked' : '')." />";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_date:
 				$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
@@ -1837,7 +1838,7 @@ $(document).ready(function() {
 		<p>'.getMLText('files_loading').'</p>
 		</div>
   <div class="modal-footer">
-    <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
+    <button class="btn" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
   </div>
 </div>
 ';