diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
 
+## 0.64.7
+### Fixed
+- Optimisations for various Blockchain endpoints.
+- More accurate item counts for various web endpoints.
+
 ## 0.64.6
 ### Fixed
 - Record cache index time just once per xpub.
diff --git a/haskoin-store-data.cabal b/haskoin-store-data.cabal
--- a/haskoin-store-data.cabal
+++ b/haskoin-store-data.cabal
@@ -4,10 +4,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 7906dee7117bfcc10547fb22bf8f7c8cb911d86789f386ad1ddb5600ececf575
+-- hash: 76f274c78531ac5c9255daff075b1c2876704184a4879a99b06fff516cc97e1d
 
 name:           haskoin-store-data
-version:        0.64.6
+version:        0.64.7
 synopsis:       Data for Haskoin Store
 description:    Please see the README on GitHub at <https://github.com/haskoin/haskoin-store#readme>
 category:       Bitcoin, Finance, Network
diff --git a/src/Haskoin/Store/Data.hs b/src/Haskoin/Store/Data.hs
--- a/src/Haskoin/Store/Data.hs
+++ b/src/Haskoin/Store/Data.hs
@@ -3316,8 +3316,8 @@
 
 toBinfoAddrs ::
     HashMap Address Balance ->
-    HashMap XPubKey [XPubBal] ->
-    HashMap XPubKey Int ->
+    HashMap XPubSpec [XPubBal] ->
+    HashMap XPubSpec Word64 ->
     [BinfoBalance]
 toBinfoAddrs only_addrs only_xpubs xpub_txs =
     xpub_bals <> addr_bals
@@ -3333,11 +3333,11 @@
             received = sum (map f xs)
             bal = fromIntegral (sum (map g xs))
             sent = if bal <= received then received - bal else 0
-            count = maybe 0 fromIntegral $ HashMap.lookup k xpub_txs
+            count = HashMap.lookupDefault 0 k xpub_txs
             ax = foldl max 0 (map (i 0) xs)
             cx = foldl max 0 (map (i 1) xs)
          in BinfoXPubBalance
-                { getBinfoXPubKey = k
+                { getBinfoXPubKey = xPubSpecKey k
                 , getBinfoAddrTxCount = count
                 , getBinfoAddrReceived = received
                 , getBinfoAddrSent = sent