diff --git a/modules/lang/beancount/autoload.el b/modules/lang/beancount/autoload.el
index 4053e3300..c43a1b5cc 100644
--- a/modules/lang/beancount/autoload.el
+++ b/modules/lang/beancount/autoload.el
@@ -123,10 +123,13 @@ If REVERSE (the prefix arg) is non-nil, sort the transactions in reverst order."
 (defun +beancount/balance (&optional all-accounts)
   "Display a balance report with bean-report (bean-report bal)."
   (interactive "P")
-  (let ((args (unless all-accounts '("-e" "Assets|Liabilities")))
-        compilation-read-command
+  (let (compilation-read-command
         current-prefix-arg)
-    (apply #'beancount--run "bean-report" buffer-file-name "balances" args)))
+    (beancount--run "bean-query"
+                    buffer-file-name
+                    (format "balances WHERE NOT close_date(account)%s"
+                            (if all-accounts
+                                "" (format " AND account ~ \"^(Assets|Liabilities)\"" ))))))
 
 ;;;###autoload
 (defun +beancount/clone-transaction ()
diff --git a/modules/lang/beancount/config.el b/modules/lang/beancount/config.el
index 7ea1de2bf..fa98b3127 100644
--- a/modules/lang/beancount/config.el
+++ b/modules/lang/beancount/config.el
@@ -28,9 +28,6 @@
           (browse-url (match-string 1 output))))))
 
   (map! :map beancount-mode-map
-        "TAB" (cmds! (and outline-minor-mode (outline-on-heading-p))
-                     #'beancount-outline-cycle
-                     #'indent-according-to-mode)
         :m "[[" #'+beancount/previous-transaction
         :m "]]" #'+beancount/next-transaction
         :localleader