diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java
index 73bc98a17a9..5155754fa49 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java
@@ -1365,7 +1365,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
                 query += " AND i.VALUE_FIELD LIKE ?" ;
             }
             if (user != null && !user.isEmpty()) {
-                query += " AND e.OWNER = ?";
+                query += " AND e.OWNER LIKE ?";
                 isOwnerProvided = true;
             }
             if (status != null && !status.isEmpty()) {
@@ -1395,7 +1395,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
                 ps.setString(index++, EnrolmentInfo.Status.REMOVED.toString());
                 ps.setString(index++, EnrolmentInfo.Status.DELETED.toString());
                 if (isDeviceNameProvided) {
-                    ps.setString(index++, name + "%");
+                    ps.setString(index++, "%" + name + "%");
                 }
                 if (isOwnershipProvided) {
                     ps.setString(index++, ownership);
@@ -1404,7 +1404,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
                     ps.setString(index++, "%" + serial + "%");
                 }
                 if (isOwnerProvided) {
-                    ps.setString(index++, user);
+                    ps.setString(index++, "%" + user + "%");
                 }
                 if (isStatusProvided) {
                     for (String deviceStatus : status) {
diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java
index 3c8e0dd8aeb..79afa4e4fed 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java
@@ -1105,7 +1105,7 @@ public class PostgreSQLDeviceDAOImpl extends GenericDeviceDAOImpl {
                 isOwnershipProvided = true;
             }
             if (user != null && !user.isEmpty()) {
-                query += " AND e.OWNER = ?";
+                query += " AND e.OWNER LIKE ?";
                 isOwnerProvided = true;
             }
             if (status != null && !status.isEmpty()) {
@@ -1136,13 +1136,13 @@ public class PostgreSQLDeviceDAOImpl extends GenericDeviceDAOImpl {
                 ps.setString(index++, EnrolmentInfo.Status.REMOVED.toString());
                 ps.setString(index++, EnrolmentInfo.Status.DELETED.toString());
                 if (isDeviceNameProvided) {
-                    ps.setString(index++, name + "%");
+                    ps.setString(index++, "%" + name + "%");
                 }
                 if (isOwnershipProvided) {
                     ps.setString(index++, ownership);
                 }
                 if (isOwnerProvided) {
-                    ps.setString(index++, user);
+                    ps.setString(index++, "%" + user + "%");
                 }
                 if (isStatusProvided) {
                     for (String deviceStatus : status) {
diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java
index 10eeb697191..e977d7bd6ed 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java
@@ -977,7 +977,7 @@ public class SQLServerDeviceDAOImpl extends GenericDeviceDAOImpl {
                 isOwnershipProvided = true;
             }
             if (user != null && !user.isEmpty()) {
-                query += " AND e.OWNER = ?";
+                query += " AND e.OWNER LIKE ?";
                 isOwnerProvided = true;
             }
             if (status != null && !status.isEmpty()) {
@@ -1008,13 +1008,13 @@ public class SQLServerDeviceDAOImpl extends GenericDeviceDAOImpl {
                 ps.setString(index++, EnrolmentInfo.Status.REMOVED.toString());
                 ps.setString(index++, EnrolmentInfo.Status.DELETED.toString());
                 if (isDeviceNameProvided) {
-                    ps.setString(index++, name + "%");
+                    ps.setString(index++, "%" + name + "%");
                 }
                 if (isOwnershipProvided) {
                     ps.setString(index++, ownership);
                 }
                 if (isOwnerProvided) {
-                    ps.setString(index++, user);
+                    ps.setString(index++, "%" + user + "%");
                 }
                 if (isStatusProvided) {
                     for (String deviceStatus : status) {