diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java
index ac97ab6d8a..ce20d367e3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java
@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.query;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
@@ -26,6 +27,7 @@ import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor
 public class AlarmDataPageLink extends EntityDataPageLink {
 
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java
index e2db80d9b9..a79066c6c5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java
@@ -16,10 +16,12 @@
 package org.thingsboard.server.common.data.query;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class AssetSearchQueryFilter extends EntitySearchQueryFilter {
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java
index d6428ae72c..8c2b31a99f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java
@@ -16,10 +16,12 @@
 package org.thingsboard.server.common.data.query;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class DeviceSearchQueryFilter extends EntitySearchQueryFilter {
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java
index 81daff3ef5..6988537d92 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java
@@ -16,10 +16,12 @@
 package org.thingsboard.server.common.data.query;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class EdgeSearchQueryFilter extends EntitySearchQueryFilter {
 
     @Override
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java
index 86974d14be..501200db7c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java
@@ -16,10 +16,12 @@
 package org.thingsboard.server.common.data.query;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class EntityViewSearchQueryFilter extends EntitySearchQueryFilter {
 
     @Override