diff --git a/lib/bcoin/keyring.js b/lib/bcoin/keyring.js
index 74b9eec4..7321d280 100644
--- a/lib/bcoin/keyring.js
+++ b/lib/bcoin/keyring.js
@@ -542,12 +542,7 @@ KeyRing.prototype.getAddress = function getAddress(enc) {
 KeyRing.prototype.getAddressMap = function getAddressMap() {
   if (!this._addressMap) {
     this._addressMap = {};
-
-    this._addressMap[this.getKeyHash('hex')] = true;
-
-    if (this.type === KeyRing.types.MULTISIG)
-      this._addressMap[this.getScriptHash('hex')] = true;
-
+    this._addressMap[this.getHash('hex')] = true;
     if (this.witness)
       this._addressMap[this.getProgramHash('hex')] = true;
   }
@@ -766,8 +761,7 @@ KeyRing.prototype.toJSON = function toJSON() {
     keys: this.keys.map(function(key) {
       return key.toString('hex');
     }),
-    keyAddress: this.getKeyAddress('base58'),
-    scriptAddress: this.getScriptAddress('base58'),
+    address: this.getAddress('base58'),
     programAddress: this.getProgramAddress('base58')
   };
 };
diff --git a/lib/bcoin/walletdb.js b/lib/bcoin/walletdb.js
index 17eed192..a850062c 100644
--- a/lib/bcoin/walletdb.js
+++ b/lib/bcoin/walletdb.js
@@ -820,17 +820,11 @@ WalletDB.prototype.saveAddress = function saveAddress(wid, addresses, callback)
   var batch = this.batch(wid);
   var i, address, path;
 
-  if (!Array.isArray(addresses))
-    addresses = [addresses];
-
   for (i = 0; i < addresses.length; i++) {
     address = addresses[i];
     path = Path.fromKeyRing(address);
 
-    items.push([address.getKeyAddress(), path]);
-
-    if (address.type === keyTypes.MULTISIG)
-      items.push([address.getScriptAddress(), path]);
+    items.push([address.getAddress(), path]);
 
     if (address.witness)
       items.push([address.getProgramAddress(), path]);