diff --git a/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java b/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java
index 6ffe4324a0..c4ce4e49b2 100644
--- a/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java
+++ b/application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java
@@ -28,6 +28,9 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 @Service
 public class EdgeEventsCleanUpService extends AbstractCleanUpService {
 
+    public static final String RANDOM_DELAY_INTERVAL_MS_EXPRESSION =
+            "#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${sql.ttl.edge_events.execution_interval_ms})}";
+
     @Value("${sql.ttl.edge_events.edge_events_ttl}")
     private long ttl;
 
@@ -41,7 +44,7 @@ public class EdgeEventsCleanUpService extends AbstractCleanUpService {
         this.edgeEventService = edgeEventService;
     }
 
-    @Scheduled(initialDelayString = "${sql.ttl.edge_events.execution_interval_ms}", fixedDelayString = "${sql.ttl.edge_events.execution_interval_ms}")
+    @Scheduled(initialDelayString = RANDOM_DELAY_INTERVAL_MS_EXPRESSION, fixedDelayString = "${sql.ttl.edge_events.execution_interval_ms}")
     public void cleanUp() {
         if (ttlTaskExecutionEnabled && isSystemTenantPartitionMine()) {
             edgeEventService.cleanupEvents(ttl);
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java b/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java
index c0fd1e529b..ff975059a1 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java
@@ -32,8 +32,8 @@ public class EdgeId extends UUIDBased implements EntityId {
         super(id);
     }
 
-    public static EdgeId fromString(String integrationId) {
-        return new EdgeId(UUID.fromString(integrationId));
+    public static EdgeId fromString(String edgeId) {
+        return new EdgeId(UUID.fromString(edgeId));
     }
 
     @ApiModelProperty(position = 2, required = true, value = "string", example = "EDGE", allowableValues = "EDGE")
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..9f41b1a6bc 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,7 +18,9 @@ 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 lombok.ToString;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
 import org.thingsboard.server.common.data.alarm.AlarmStatus;
@@ -26,6 +28,8 @@ import org.thingsboard.server.common.data.alarm.AlarmStatus;
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(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..951bbac030 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,14 @@
 package org.thingsboard.server.common.data.query;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(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..ff93d31856 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,14 @@
 package org.thingsboard.server.common.data.query;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(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..25b87629ee 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,14 @@
 package org.thingsboard.server.common.data.query;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(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..47ff69c091 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,14 @@
 package org.thingsboard.server.common.data.query;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class EntityViewSearchQueryFilter extends EntitySearchQueryFilter {
 
     @Override