better walletIds storage
Merge pull request #2195 from matiu/bug/walletids

better walletIds storage