1 files changed, 2 insertions, 2 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java b/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java
index 080d4871b..c57710ce0 100644
--- a/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java
+++ b/base/common/src/com/netscape/cms/servlet/key/KeysResourceService.java
@@ -67,12 +67,12 @@ public class KeysResourceService extends CMSResourceService implements KeysResou
         }
 
         if (status != null) {
-            filter += "(status=" + LDAPUtil.escape(status) + ")";
+            filter += "(status=" + LDAPUtil.escapeFilter(status) + ")";
             matches ++;
         }
 
         if (clientID != null) {
-            filter += "(clientID=" + LDAPUtil.escape(clientID) + ")";
+            filter += "(clientID=" + LDAPUtil.escapeFilter(clientID) + ")";
             matches ++;
         }