diff --git a/iol_ion/src/iol_ion/query.clj b/iol_ion/src/iol_ion/query.clj
index 44a61b38..e02495b1 100644
--- a/iol_ion/src/iol_ion/query.clj
+++ b/iol_ion/src/iol_ion/query.clj
@@ -190,15 +190,14 @@
 
 (defn account-snapshot [db client-id ^java.util.Date end]
   (for [running-balance-set (account-sets db client-id)
-        :let [{id :e [client-id account-id location date _ _ current-balance] :v}
+        :let [z
               (->> running-balance-set
                    (take-while (fn until-date [^Line l]
                                  (let [^java.util.Date d (.-date l)]
                                    (<= (.compareTo ^java.util.Date d end) 0))))
-                   last)]
-        :when id]
-    [client-id account-id location date current-balance]))
-
+                   last) ]
+        :when (.-id z)]
+    [(.-client-id z) (.-account-id z) (.-location z) (.-date z) (.-running-balance z)]))
 
 (defn detailed-account-snapshot [db client-id ^java.util.Date end]
   (for [running-balance-set (account-sets db client-id)