diff --git a/process/AttributeFilter_lib/process.js b/process/AttributeFilter_lib/process.js
index d4a51281dafac4128e833fb23b137e57ae525036..2177479e97f3ed74f2c053783ac786db5a820542 100644
--- a/process/AttributeFilter_lib/process.js
+++ b/process/AttributeFilter_lib/process.js
@@ -107,7 +107,7 @@ AttributeFilterExtensionMaker.getFilterCondition = function(pObjectType, pFilter
     var attributeId = name.id;
     var attributeType = name.type;
     
-    if (attributeType == $AttributeTypes.VOID.toString())
+    if (attributeType == $AttributeTypes.VOID.toString() || (attributeType == $AttributeTypes.BOOLEAN.toString() && (pOperatorName == "IS NOT NULL" || pOperatorName == "IS NULL")))
     {
         preparedValues.push([pObjectType, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.OBJECT_TYPE")]);
         preparedValues.push([attributeId, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID")]);
@@ -128,7 +128,13 @@ AttributeFilterExtensionMaker.getFilterCondition = function(pObjectType, pFilter
         var dbField = AttributeTypeUtil.getDatabaseField(name.type);
 
         var condition = pCondition;
-        condition = condition.replace("{'table.column'}", dbField, "g");
+        if (attributeType == $AttributeTypes.BOOLEAN.toString())
+            condition = dbField + (pOperatorName == "LIKE" ? " = " : " != ")  + pRawValue;
+        else
+        {
+            condition = pCondition;
+            condition = condition.replace("{'table.column'}", dbField, "g");
+        }
         preparedValues.push([pObjectType, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.OBJECT_TYPE")]);
         preparedValues.push([attributeId, SqlUtils.getSingleColumnType("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID")]);
 
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 1dcfae598c75d8515b2679d9289006bc0b03322e..aaf8831ae15eca51807da5ab7a920ccd4b1c17df 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1159,7 +1159,7 @@ AttributeUsageUtil.removeDuplicates = function (pAttributeId)
     
     var attributeSelect = newSelect("AB_ATTRIBUTEUSAGEID, AB_ATTRIBUTE_ID, OBJECT_TYPE")
                                 .from("AB_ATTRIBUTEUSAGE")
-                                .and(null, newSelect("AB_ATTRIBUTEUSAGEID")
+                                .where(null, newSelect("AB_ATTRIBUTEUSAGEID")
                                                 .from("AB_ATTRIBUTEUSAGE AU")
                                                 .where("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID = AU.AB_ATTRIBUTE_ID")
                                                 .and("AB_ATTRIBUTEUSAGE.OBJECT_TYPE = AU.OBJECT_TYPE")