diff --git a/src/main/java/tech/ailef/dbadmin/external/dbmapping/CustomJpaRepository.java b/src/main/java/tech/ailef/dbadmin/external/dbmapping/CustomJpaRepository.java
index d4eaca9..a96b327 100644
--- a/src/main/java/tech/ailef/dbadmin/external/dbmapping/CustomJpaRepository.java
+++ b/src/main/java/tech/ailef/dbadmin/external/dbmapping/CustomJpaRepository.java
@@ -87,11 +87,13 @@ public class CustomJpaRepository extends SimpleJpaRepository {
         
         query.select(root)
             .where(
-            	cb.and(
-            		finalPredicates.toArray(new Predicate[finalPredicates.size()]) // query search on String fields
+            	cb.or(
+            		cb.and(finalPredicates.toArray(new Predicate[finalPredicates.size()])), // query search on String fields
+            		cb.equal(root.get(schema.getPrimaryKey().getName()), q)
             	)
             	
             );
+
         if (sortKey !=  null)
         	query.orderBy(sortOrder.equals("DESC") ? cb.desc(root.get(sortKey)) : cb.asc(root.get(sortKey)));