diff --git a/hgext3rd/smartlog.py b/hgext3rd/smartlog.py
--- a/hgext3rd/smartlog.py
+++ b/hgext3rd/smartlog.py
@@ -488,7 +488,7 @@
         # heads should have a remote bookmark indicating them. This allows us
         # to force push server bookmarks to new locations, and not have the
         # commits clutter the user's smartlog.
-        headquery = 'draft() &' + headquery
+        headquery = 'heads(draft()) & branch(.)'
 
     allheads = set(repo.revs(headquery))
     if recentdays >= 0:
diff --git a/infinitepush/backupcommands.py b/infinitepush/backupcommands.py
--- a/infinitepush/backupcommands.py
+++ b/infinitepush/backupcommands.py
@@ -391,7 +391,7 @@
     maxheadstobackup = ui.configint('infinitepushbackup',
                                     'maxheadstobackup', -1)
 
-    revset = 'head() & draft() & not obsolete()'
+    revset = 'heads(draft()) & not obsolete()'
 
     backupheads = [ctx.hex() for ctx in repo.set(revset)]
     if maxheadstobackup > 0: