diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91f5a207..8d01d99b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,13 +17,16 @@ If you are upgrading from v0.16.x, replace the binary (or run `docker pull`). If
 ## Fixed
 - JMAP conformance (pass the [jmap-test-suite](https://github.com/jmapio/jmap-test-suite) tests):
   - Default calendars and address books are not subscribed by default.
-  - Unchanged immutable `id` property is rejected on `/set`.
-  - `filter: null` rejected as `notRequest` on `/query` and `/queryChanges`.
-  - `Email/query` total miscount when `collapseThreads` is enabled.
-  - `SearchSnippet/get` response structure.
-  - `VacationResponse` singleton handling.
-  - `EmailSubmission/set` must return `sendAt` and `undoStatus` in the created response.
-  - `Thread/changes` never emits a container delete when a thread becomes empty.
+  - `*/set`: Unchanged immutable `id` property is rejected on update.
+  - `*/query` and `*/queryChanges`: null` rejected as `notRequest`.
+  - `Email/query`:
+    * Total miscount when `collapseThreads` is enabled.
+    * Wrong sort order on `hasKeyword`, `allInThreadHaveKeyword`, and `someInThreadHaveKeyword` conditions.
+    * Non-standard header values are not searchable.
+  - `SearchSnippet/get`: incorrect response structure.
+  - `VacationResponse/set`: incorrect singleton handling.
+  - `EmailSubmission/set`: return `sendAt` and `undoStatus` in the created response.
+  - `Thread/changes`: emit a container delete when a thread becomes empty.
 - OIDC: Add default domain name to groups that are not email addresses.
 - RocksDB: Enable blob garbage collection to reclaim disk space from deleted blobs.
 
diff --git a/crates/store/src/search/local.rs b/crates/store/src/search/local.rs
index f470238f..944052a2 100644
--- a/crates/store/src/search/local.rs
+++ b/crates/store/src/search/local.rs
@@ -200,8 +200,8 @@ impl QueryResults {
                 for comparator in &comparators {
                     let (a, b, is_ascending) = match comparator {
                         SearchComparator::DocumentSet { set, ascending } => (
-                            !set.contains(*a) as u32,
-                            !set.contains(*b) as u32,
+                            set.contains(*a) as u32,
+                            set.contains(*b) as u32,
                             *ascending,
                         ),
                         SearchComparator::SortedSet { set, ascending } => {