diff --git a/api/lib/models/event/item/model.freezed.dart b/api/lib/models/event/item/model.freezed.dart
index 679dfb89273..86106a5df8c 100644
--- a/api/lib/models/event/item/model.freezed.dart
+++ b/api/lib/models/event/item/model.freezed.dart
@@ -473,15 +473,15 @@ class _$FixedCalendarItemImpl extends FixedCalendarItem {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$FixedCalendarItemImpl &&
-            (identical(other.id, id) || other.id == id) &&
+            const DeepCollectionEquality().equals(other.id, id) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.description, description) ||
                 other.description == description) &&
             (identical(other.location, location) ||
                 other.location == location) &&
-            (identical(other.groupId, groupId) || other.groupId == groupId) &&
-            (identical(other.placeId, placeId) || other.placeId == placeId) &&
-            (identical(other.eventId, eventId) || other.eventId == eventId) &&
+            const DeepCollectionEquality().equals(other.groupId, groupId) &&
+            const DeepCollectionEquality().equals(other.placeId, placeId) &&
+            const DeepCollectionEquality().equals(other.eventId, eventId) &&
             (identical(other.status, status) || other.status == status) &&
             (identical(other.start, start) || other.start == start) &&
             (identical(other.end, end) || other.end == end));
@@ -489,8 +489,18 @@ class _$FixedCalendarItemImpl extends FixedCalendarItem {
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, id, name, description, location,
-      groupId, placeId, eventId, status, start, end);
+  int get hashCode => Object.hash(
+      runtimeType,
+      const DeepCollectionEquality().hash(id),
+      name,
+      description,
+      location,
+      const DeepCollectionEquality().hash(groupId),
+      const DeepCollectionEquality().hash(placeId),
+      const DeepCollectionEquality().hash(eventId),
+      status,
+      start,
+      end);
 
   /// Create a copy of CalendarItem
   /// with the given fields replaced by the non-null parameter values.
@@ -980,15 +990,15 @@ class _$RepeatingCalendarItemImpl extends RepeatingCalendarItem {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$RepeatingCalendarItemImpl &&
-            (identical(other.id, id) || other.id == id) &&
+            const DeepCollectionEquality().equals(other.id, id) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.description, description) ||
                 other.description == description) &&
             (identical(other.location, location) ||
                 other.location == location) &&
-            (identical(other.groupId, groupId) || other.groupId == groupId) &&
-            (identical(other.placeId, placeId) || other.placeId == placeId) &&
-            (identical(other.eventId, eventId) || other.eventId == eventId) &&
+            const DeepCollectionEquality().equals(other.groupId, groupId) &&
+            const DeepCollectionEquality().equals(other.placeId, placeId) &&
+            const DeepCollectionEquality().equals(other.eventId, eventId) &&
             (identical(other.status, status) || other.status == status) &&
             (identical(other.start, start) || other.start == start) &&
             (identical(other.end, end) || other.end == end) &&
@@ -1008,13 +1018,13 @@ class _$RepeatingCalendarItemImpl extends RepeatingCalendarItem {
   @override
   int get hashCode => Object.hash(
       runtimeType,
-      id,
+      const DeepCollectionEquality().hash(id),
       name,
       description,
       location,
-      groupId,
-      placeId,
-      eventId,
+      const DeepCollectionEquality().hash(groupId),
+      const DeepCollectionEquality().hash(placeId),
+      const DeepCollectionEquality().hash(eventId),
       status,
       start,
       end,
@@ -1534,20 +1544,20 @@ class _$AutoCalendarItemImpl extends AutoCalendarItem {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$AutoCalendarItemImpl &&
-            (identical(other.id, id) || other.id == id) &&
+            const DeepCollectionEquality().equals(other.id, id) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.description, description) ||
                 other.description == description) &&
             (identical(other.location, location) ||
                 other.location == location) &&
-            (identical(other.groupId, groupId) || other.groupId == groupId) &&
-            (identical(other.placeId, placeId) || other.placeId == placeId) &&
-            (identical(other.eventId, eventId) || other.eventId == eventId) &&
+            const DeepCollectionEquality().equals(other.groupId, groupId) &&
+            const DeepCollectionEquality().equals(other.placeId, placeId) &&
+            const DeepCollectionEquality().equals(other.eventId, eventId) &&
             (identical(other.status, status) || other.status == status) &&
             (identical(other.start, start) || other.start == start) &&
             (identical(other.end, end) || other.end == end) &&
-            (identical(other.autoGroupId, autoGroupId) ||
-                other.autoGroupId == autoGroupId) &&
+            const DeepCollectionEquality()
+                .equals(other.autoGroupId, autoGroupId) &&
             (identical(other.searchStart, searchStart) ||
                 other.searchStart == searchStart) &&
             (identical(other.autoDuration, autoDuration) ||
@@ -1558,17 +1568,17 @@ class _$AutoCalendarItemImpl extends AutoCalendarItem {
   @override
   int get hashCode => Object.hash(
       runtimeType,
-      id,
+      const DeepCollectionEquality().hash(id),
       name,
       description,
       location,
-      groupId,
-      placeId,
-      eventId,
+      const DeepCollectionEquality().hash(groupId),
+      const DeepCollectionEquality().hash(placeId),
+      const DeepCollectionEquality().hash(eventId),
       status,
       start,
       end,
-      autoGroupId,
+      const DeepCollectionEquality().hash(autoGroupId),
       searchStart,
       autoDuration);
 
diff --git a/api/lib/models/event/model.freezed.dart b/api/lib/models/event/model.freezed.dart
index bcacd7236a8..435f2af3328 100644
--- a/api/lib/models/event/model.freezed.dart
+++ b/api/lib/models/event/model.freezed.dart
@@ -264,11 +264,10 @@ class _$EventImpl extends _Event {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$EventImpl &&
-            (identical(other.id, id) || other.id == id) &&
-            (identical(other.parentId, parentId) ||
-                other.parentId == parentId) &&
-            (identical(other.groupId, groupId) || other.groupId == groupId) &&
-            (identical(other.placeId, placeId) || other.placeId == placeId) &&
+            const DeepCollectionEquality().equals(other.id, id) &&
+            const DeepCollectionEquality().equals(other.parentId, parentId) &&
+            const DeepCollectionEquality().equals(other.groupId, groupId) &&
+            const DeepCollectionEquality().equals(other.placeId, placeId) &&
             (identical(other.blocked, blocked) || other.blocked == blocked) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.description, description) ||
@@ -280,8 +279,17 @@ class _$EventImpl extends _Event {
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, id, parentId, groupId, placeId,
-      blocked, name, description, location, extra);
+  int get hashCode => Object.hash(
+      runtimeType,
+      const DeepCollectionEquality().hash(id),
+      const DeepCollectionEquality().hash(parentId),
+      const DeepCollectionEquality().hash(groupId),
+      const DeepCollectionEquality().hash(placeId),
+      blocked,
+      name,
+      description,
+      location,
+      extra);
 
   /// Create a copy of Event
   /// with the given fields replaced by the non-null parameter values.
diff --git a/api/lib/models/group/model.freezed.dart b/api/lib/models/group/model.freezed.dart
index 1f3bb3a1815..f334d4d546c 100644
--- a/api/lib/models/group/model.freezed.dart
+++ b/api/lib/models/group/model.freezed.dart
@@ -178,17 +178,21 @@ class _$GroupImpl extends _Group {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$GroupImpl &&
-            (identical(other.id, id) || other.id == id) &&
+            const DeepCollectionEquality().equals(other.id, id) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.description, description) ||
                 other.description == description) &&
-            (identical(other.parentId, parentId) ||
-                other.parentId == parentId));
+            const DeepCollectionEquality().equals(other.parentId, parentId));
   }
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, id, name, description, parentId);
+  int get hashCode => Object.hash(
+      runtimeType,
+      const DeepCollectionEquality().hash(id),
+      name,
+      description,
+      const DeepCollectionEquality().hash(parentId));
 
   /// Create a copy of Group
   /// with the given fields replaced by the non-null parameter values.
diff --git a/api/lib/models/label/model.freezed.dart b/api/lib/models/label/model.freezed.dart
index 55edce39abf..4aa90f30787 100644
--- a/api/lib/models/label/model.freezed.dart
+++ b/api/lib/models/label/model.freezed.dart
@@ -177,7 +177,7 @@ class _$LabelImpl extends _Label {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$LabelImpl &&
-            (identical(other.id, id) || other.id == id) &&
+            const DeepCollectionEquality().equals(other.id, id) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.description, description) ||
                 other.description == description) &&
@@ -186,7 +186,8 @@ class _$LabelImpl extends _Label {
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, id, name, description, color);
+  int get hashCode => Object.hash(runtimeType,
+      const DeepCollectionEquality().hash(id), name, description, color);
 
   /// Create a copy of Label
   /// with the given fields replaced by the non-null parameter values.
diff --git a/api/lib/models/note/model.freezed.dart b/api/lib/models/note/model.freezed.dart
index 901da9b0250..55f7f9cefe1 100644
--- a/api/lib/models/note/model.freezed.dart
+++ b/api/lib/models/note/model.freezed.dart
@@ -156,7 +156,7 @@ class _$NotebookImpl extends _Notebook {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$NotebookImpl &&
-            (identical(other.id, id) || other.id == id) &&
+            const DeepCollectionEquality().equals(other.id, id) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.description, description) ||
                 other.description == description));
@@ -164,7 +164,8 @@ class _$NotebookImpl extends _Notebook {
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, id, name, description);
+  int get hashCode => Object.hash(
+      runtimeType, const DeepCollectionEquality().hash(id), name, description);
 
   /// Create a copy of Notebook
   /// with the given fields replaced by the non-null parameter values.
@@ -422,11 +423,10 @@ class _$NoteImpl extends _Note {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$NoteImpl &&
-            (identical(other.notebookId, notebookId) ||
-                other.notebookId == notebookId) &&
-            (identical(other.id, id) || other.id == id) &&
-            (identical(other.parentId, parentId) ||
-                other.parentId == parentId) &&
+            const DeepCollectionEquality()
+                .equals(other.notebookId, notebookId) &&
+            const DeepCollectionEquality().equals(other.id, id) &&
+            const DeepCollectionEquality().equals(other.parentId, parentId) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.description, description) ||
                 other.description == description) &&
@@ -437,8 +437,15 @@ class _$NoteImpl extends _Note {
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, notebookId, id, parentId, name,
-      description, status, priority);
+  int get hashCode => Object.hash(
+      runtimeType,
+      const DeepCollectionEquality().hash(notebookId),
+      const DeepCollectionEquality().hash(id),
+      const DeepCollectionEquality().hash(parentId),
+      name,
+      description,
+      status,
+      priority);
 
   /// Create a copy of Note
   /// with the given fields replaced by the non-null parameter values.
diff --git a/api/lib/models/place/model.freezed.dart b/api/lib/models/place/model.freezed.dart
index d61fdfe70c4..642249452d8 100644
--- a/api/lib/models/place/model.freezed.dart
+++ b/api/lib/models/place/model.freezed.dart
@@ -177,7 +177,7 @@ class _$PlaceImpl extends _Place {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$PlaceImpl &&
-            (identical(other.id, id) || other.id == id) &&
+            const DeepCollectionEquality().equals(other.id, id) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.description, description) ||
                 other.description == description) &&
@@ -186,7 +186,8 @@ class _$PlaceImpl extends _Place {
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, id, name, description, address);
+  int get hashCode => Object.hash(runtimeType,
+      const DeepCollectionEquality().hash(id), name, description, address);
 
   /// Create a copy of Place
   /// with the given fields replaced by the non-null parameter values.
diff --git a/api/lib/models/user/model.freezed.dart b/api/lib/models/user/model.freezed.dart
index 94587e54307..fec5976cbfa 100644
--- a/api/lib/models/user/model.freezed.dart
+++ b/api/lib/models/user/model.freezed.dart
@@ -229,8 +229,8 @@ class _$UserImpl extends _User {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$UserImpl &&
-            (identical(other.id, id) || other.id == id) &&
-            (identical(other.groupId, groupId) || other.groupId == groupId) &&
+            const DeepCollectionEquality().equals(other.id, id) &&
+            const DeepCollectionEquality().equals(other.groupId, groupId) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.email, email) || other.email == email) &&
             (identical(other.description, description) ||
@@ -241,8 +241,15 @@ class _$UserImpl extends _User {
 
   @JsonKey(includeFromJson: false, includeToJson: false)
   @override
-  int get hashCode => Object.hash(runtimeType, id, groupId, name, email,
-      description, phone, const DeepCollectionEquality().hash(image));
+  int get hashCode => Object.hash(
+      runtimeType,
+      const DeepCollectionEquality().hash(id),
+      const DeepCollectionEquality().hash(groupId),
+      name,
+      email,
+      description,
+      phone,
+      const DeepCollectionEquality().hash(image));
 
   /// Create a copy of User
   /// with the given fields replaced by the non-null parameter values.
diff --git a/app/lib/pages/calendar/filter.freezed.dart b/app/lib/pages/calendar/filter.freezed.dart
index d013d3d41bd..371bbf4da4a 100644
--- a/app/lib/pages/calendar/filter.freezed.dart
+++ b/app/lib/pages/calendar/filter.freezed.dart
@@ -212,9 +212,9 @@ class _$CalendarFilterImpl extends _CalendarFilter {
             const DeepCollectionEquality()
                 .equals(other._hiddenStatuses, _hiddenStatuses) &&
             (identical(other.source, source) || other.source == source) &&
-            (identical(other.group, group) || other.group == group) &&
-            (identical(other.event, event) || other.event == event) &&
-            (identical(other.place, place) || other.place == place) &&
+            const DeepCollectionEquality().equals(other.group, group) &&
+            const DeepCollectionEquality().equals(other.event, event) &&
+            const DeepCollectionEquality().equals(other.place, place) &&
             (identical(other.past, past) || other.past == past));
   }
 
@@ -223,9 +223,9 @@ class _$CalendarFilterImpl extends _CalendarFilter {
       runtimeType,
       const DeepCollectionEquality().hash(_hiddenStatuses),
       source,
-      group,
-      event,
-      place,
+      const DeepCollectionEquality().hash(group),
+      const DeepCollectionEquality().hash(event),
+      const DeepCollectionEquality().hash(place),
       past);
 
   /// Create a copy of CalendarFilter
diff --git a/app/lib/pages/events/filter.freezed.dart b/app/lib/pages/events/filter.freezed.dart
index 3a0442be2f9..75db5b65bf1 100644
--- a/app/lib/pages/events/filter.freezed.dart
+++ b/app/lib/pages/events/filter.freezed.dart
@@ -140,12 +140,16 @@ class _$EventFilterImpl extends _EventFilter {
         (other.runtimeType == runtimeType &&
             other is _$EventFilterImpl &&
             (identical(other.source, source) || other.source == source) &&
-            (identical(other.group, group) || other.group == group) &&
-            (identical(other.place, place) || other.place == place));
+            const DeepCollectionEquality().equals(other.group, group) &&
+            const DeepCollectionEquality().equals(other.place, place));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType, source, group, place);
+  int get hashCode => Object.hash(
+      runtimeType,
+      source,
+      const DeepCollectionEquality().hash(group),
+      const DeepCollectionEquality().hash(place));
 
   /// Create a copy of EventFilter
   /// with the given fields replaced by the non-null parameter values.
diff --git a/app/lib/pages/notes/filter.freezed.dart b/app/lib/pages/notes/filter.freezed.dart
index be666eec80f..8363d0939e8 100644
--- a/app/lib/pages/notes/filter.freezed.dart
+++ b/app/lib/pages/notes/filter.freezed.dart
@@ -225,16 +225,22 @@ class _$NoteFilterImpl extends _NoteFilter {
                 other.showTodo == showTodo) &&
             (identical(other.showNote, showNote) ||
                 other.showNote == showNote) &&
-            (identical(other.selectedLabel, selectedLabel) ||
-                other.selectedLabel == selectedLabel) &&
-            (identical(other.notebook, notebook) ||
-                other.notebook == notebook) &&
+            const DeepCollectionEquality()
+                .equals(other.selectedLabel, selectedLabel) &&
+            const DeepCollectionEquality().equals(other.notebook, notebook) &&
             (identical(other.source, source) || other.source == source));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType, showDone, showInProgress,
-      showTodo, showNote, selectedLabel, notebook, source);
+  int get hashCode => Object.hash(
+      runtimeType,
+      showDone,
+      showInProgress,
+      showTodo,
+      showNote,
+      const DeepCollectionEquality().hash(selectedLabel),
+      const DeepCollectionEquality().hash(notebook),
+      source);
 
   /// Create a copy of NoteFilter
   /// with the given fields replaced by the non-null parameter values.
diff --git a/app/lib/pages/users/filter.freezed.dart b/app/lib/pages/users/filter.freezed.dart
index c833228b7ab..2cda3baa068 100644
--- a/app/lib/pages/users/filter.freezed.dart
+++ b/app/lib/pages/users/filter.freezed.dart
@@ -127,11 +127,12 @@ class _$UserFilterImpl implements _UserFilter {
         (other.runtimeType == runtimeType &&
             other is _$UserFilterImpl &&
             (identical(other.source, source) || other.source == source) &&
-            (identical(other.group, group) || other.group == group));
+            const DeepCollectionEquality().equals(other.group, group));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType, source, group);
+  int get hashCode => Object.hash(
+      runtimeType, source, const DeepCollectionEquality().hash(group));
 
   /// Create a copy of UserFilter
   /// with the given fields replaced by the non-null parameter values.