diff --git a/client/src/App.tsx b/client/src/App.tsx
index 7eb6481..03389bd 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -160,11 +160,10 @@ class App extends Component<{}, AppState> {
                 isLoading: false,
                 ocean
             })
-            // TODO: squid-js balance retrieval fix
             const accounts = await ocean.getAccounts()
             const balance = await accounts[0].getBalance()
-            this.setState({ balance })
-            // TODO: squid-js expose keeper for getNetworkName
+            const network = await ocean.keeper.getNetworkName()
+            this.setState({ balance, network })
         } catch (e) {
             Logger.log('ocean/balance error', e)
             this.setState({
diff --git a/client/src/components/molecules/AssetsUser.tsx b/client/src/components/molecules/AssetsUser.tsx
index 0ce6039..6fe82ed 100644
--- a/client/src/components/molecules/AssetsUser.tsx
+++ b/client/src/components/molecules/AssetsUser.tsx
@@ -48,8 +48,8 @@ export default class AssetsUser extends PureComponent {
                     <Spinner />
                 ) : this.state.results.length ? (
                     <div className={styles.assets}>
-                        {this.state.results.map((asset, index) => (
-                            <Asset key={index} asset={asset} />
+                        {this.state.results.map((asset: any) => (
+                            <Asset key={asset.id} asset={asset} />
                         ))}
                     </div>
                 ) : (
diff --git a/client/src/routes/Search.tsx b/client/src/routes/Search.tsx
index fb5c4f1..581f421 100644
--- a/client/src/routes/Search.tsx
+++ b/client/src/routes/Search.tsx
@@ -4,6 +4,7 @@ import Route from '../components/templates/Route'
 import { User } from '../context/User'
 import Asset from '../components/molecules/Asset'
 import styles from './Search.module.scss'
+import { Logger } from '@oceanprotocol/squid';
 
 interface SearchState {
     results: any[]
@@ -26,8 +27,8 @@ export default class Search extends Component<SearchProps, SearchState> {
     public renderResults = () =>
         this.state.results.length ? (
             <div className={styles.results}>
-                {this.state.results.map(asset => (
-                    <Asset key={asset} asset={asset} />
+                {this.state.results.map((asset: any) => (
+                    <Asset key={asset.id} asset={asset} />
                 ))}
             </div>
         ) : (