diff --git a/v25/storage/dbstorage.py b/v25/storage/dbstorage.py
index 309aa8b..301f2a8 100644
--- a/v25/storage/dbstorage.py
+++ b/v25/storage/dbstorage.py
@@ -154,9 +154,11 @@ class DBStorage(AbstractStorage):
         if params.get('after'):
             query = query.filter(Msg.oid > self.one_alike(
                 session,
-                Message(pair[0], pair[1], Encoding.decode(params['before']), None,
+                Message(pair[0], pair[1], Encoding.decode(params['after']), None,
                         None, None, None,
                         '')).oid)
+        if params.get('exact'):
+            query = query.filter(Msg.idn == Encoding.decode(params['exact']))
         for flag in params.get('flags', ()):
             query = query.filter(Msg.flags.contains(flag))
         query = query.order_by(Msg.oid.desc())