diff --git a/lib/model/filters/album.dart b/lib/model/filters/album.dart
index f4b01222f..e9b1722df 100644
--- a/lib/model/filters/album.dart
+++ b/lib/model/filters/album.dart
@@ -97,5 +97,5 @@ class AlbumFilter extends CoveredCollectionFilter {
 
   // key `album-{path}` is expected by test driver
   @override
-  String get key => '$type-$album';
+  String get key => '$type-$reversed-$album';
 }
diff --git a/lib/model/filters/coordinate.dart b/lib/model/filters/coordinate.dart
index a10e715be..704d6bac3 100644
--- a/lib/model/filters/coordinate.dart
+++ b/lib/model/filters/coordinate.dart
@@ -72,5 +72,5 @@ class CoordinateFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => '$type-$sw-$ne';
+  String get key => '$type-$reversed-$sw-$ne';
 }
diff --git a/lib/model/filters/date.dart b/lib/model/filters/date.dart
index c56876881..3c82ae15c 100644
--- a/lib/model/filters/date.dart
+++ b/lib/model/filters/date.dart
@@ -137,7 +137,7 @@ class DateFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => '$type-$level-$date';
+  String get key => '$type-$reversed-$level-$date';
 }
 
 enum DateLevel { y, ym, ymd, md, m, d }
diff --git a/lib/model/filters/favourite.dart b/lib/model/filters/favourite.dart
index 197fb21d1..7a028411c 100644
--- a/lib/model/filters/favourite.dart
+++ b/lib/model/filters/favourite.dart
@@ -56,5 +56,5 @@ class FavouriteFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => type;
+  String get key => '$type-$reversed';
 }
diff --git a/lib/model/filters/location.dart b/lib/model/filters/location.dart
index 3fad0a7a3..97289cfd8 100644
--- a/lib/model/filters/location.dart
+++ b/lib/model/filters/location.dart
@@ -82,7 +82,7 @@ class LocationFilter extends CoveredCollectionFilter {
   String get category => type;
 
   @override
-  String get key => '$type-$level-$_location';
+  String get key => '$type-$reversed-$level-$_location';
 
   // U+0041 Latin Capital letter A
   // U+1F1E6 🇦 REGIONAL INDICATOR SYMBOL LETTER A
diff --git a/lib/model/filters/mime.dart b/lib/model/filters/mime.dart
index bceaadc09..1cdc1f052 100644
--- a/lib/model/filters/mime.dart
+++ b/lib/model/filters/mime.dart
@@ -98,5 +98,5 @@ class MimeFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => '$type-$mime';
+  String get key => '$type-$reversed-$mime';
 }
diff --git a/lib/model/filters/missing.dart b/lib/model/filters/missing.dart
index 03c80646d..84cd17a90 100644
--- a/lib/model/filters/missing.dart
+++ b/lib/model/filters/missing.dart
@@ -74,5 +74,5 @@ class MissingFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => '$type-$metadataType';
+  String get key => '$type-$reversed-$metadataType';
 }
diff --git a/lib/model/filters/path.dart b/lib/model/filters/path.dart
index cb5d5308a..f8b05afc7 100644
--- a/lib/model/filters/path.dart
+++ b/lib/model/filters/path.dart
@@ -51,5 +51,5 @@ class PathFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => '$type-$path';
+  String get key => '$type-$reversed-$path';
 }
diff --git a/lib/model/filters/placeholder.dart b/lib/model/filters/placeholder.dart
index a53ff307d..933ac331e 100644
--- a/lib/model/filters/placeholder.dart
+++ b/lib/model/filters/placeholder.dart
@@ -91,5 +91,5 @@ class PlaceholderFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => '$type-$placeholder';
+  String get key => '$type-$reversed-$placeholder';
 }
diff --git a/lib/model/filters/query.dart b/lib/model/filters/query.dart
index 05ccc1c6d..b82a2ab1c 100644
--- a/lib/model/filters/query.dart
+++ b/lib/model/filters/query.dart
@@ -99,7 +99,7 @@ class QueryFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => '$type-$query';
+  String get key => '$type-$reversed-$query';
 
   EntryFilter? fieldTest(String upQuery) {
     var match = _fieldPattern.firstMatch(upQuery);
diff --git a/lib/model/filters/rating.dart b/lib/model/filters/rating.dart
index ad2a44998..0cf9cfbc3 100644
--- a/lib/model/filters/rating.dart
+++ b/lib/model/filters/rating.dart
@@ -58,7 +58,7 @@ class RatingFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => '$type-$rating';
+  String get key => '$type-$reversed-$rating';
 
   static String formatRating(BuildContext context, int rating) {
     switch (rating) {
diff --git a/lib/model/filters/recent.dart b/lib/model/filters/recent.dart
index c1555bab0..d8cfb3e78 100644
--- a/lib/model/filters/recent.dart
+++ b/lib/model/filters/recent.dart
@@ -57,5 +57,5 @@ class RecentlyAddedFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => type;
+  String get key => '$type-$reversed';
 }
diff --git a/lib/model/filters/tag.dart b/lib/model/filters/tag.dart
index 389da1f4e..fd0cddc41 100644
--- a/lib/model/filters/tag.dart
+++ b/lib/model/filters/tag.dart
@@ -53,5 +53,5 @@ class TagFilter extends CoveredCollectionFilter {
   String get category => type;
 
   @override
-  String get key => '$type-$tag';
+  String get key => '$type-$reversed-$tag';
 }
diff --git a/lib/model/filters/trash.dart b/lib/model/filters/trash.dart
index 666236dc2..a378a8668 100644
--- a/lib/model/filters/trash.dart
+++ b/lib/model/filters/trash.dart
@@ -47,5 +47,5 @@ class TrashFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => type;
+  String get key => '$type-$reversed';
 }
diff --git a/lib/model/filters/type.dart b/lib/model/filters/type.dart
index 7a7788466..3ecb278f7 100644
--- a/lib/model/filters/type.dart
+++ b/lib/model/filters/type.dart
@@ -129,5 +129,5 @@ class TypeFilter extends CollectionFilter {
   String get category => type;
 
   @override
-  String get key => '$type-$itemType';
+  String get key => '$type-$reversed-$itemType';
 }