diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index 211e6db19c0..6fecd2c3c6d 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -1162,11 +1162,15 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
 
         if (keyword != null) {
             SearchCriteria<UserVmJoinVO> ssc = _userVmJoinDao.createSearchCriteria();
-            ssc.addOr("displayName", SearchCriteria.Op.LIKE, "%" + keyword + "%");
-            ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+            String likeKeyword = String.format("%%%s%%", keyword);
+            ssc.addOr("displayName", SearchCriteria.Op.LIKE, likeKeyword);
+            ssc.addOr("name", SearchCriteria.Op.LIKE, likeKeyword);
             if (isRootAdmin) {
-                ssc.addOr("instanceName", SearchCriteria.Op.LIKE, "%" + keyword + "%");
+                ssc.addOr("instanceName", SearchCriteria.Op.LIKE, likeKeyword);
             }
+            ssc.addOr("ipAddress", SearchCriteria.Op.LIKE, likeKeyword);
+            ssc.addOr("publicIpAddress", SearchCriteria.Op.LIKE, likeKeyword);
+            ssc.addOr("ip6Address", SearchCriteria.Op.LIKE, likeKeyword);
             ssc.addOr("state", SearchCriteria.Op.EQ, keyword);
             sc.addAnd("displayName", SearchCriteria.Op.SC, ssc);
         }