diff --git a/app/api/routes/content.py b/app/api/routes/content.py
index 7c81e91..ed8681b 100644
--- a/app/api/routes/content.py
+++ b/app/api/routes/content.py
@@ -10,8 +10,11 @@ async def s_api_v1_content_list(request):
     assert 0 <= offset, "Invalid offset"
     assert 0 < limit <= 1000, "Invalid limit"
 
+    store = request.args.get('store', 'local')
+    assert store in ('local', 'onchain'), "Invalid store"
+
     content_list = request.ctx.db_session.query(StoredContent).filter(
-        StoredContent.type == 'local/content_bin'
+        StoredContent.type.like(store + '%')
     ).order_by(StoredContent.created.desc()).offset(offset).limit(limit)
     make_log("Content", f"Listed {content_list.count()} contents", level='info')
     result = {}
diff --git a/app/bot/routers/tonconnect.py b/app/bot/routers/tonconnect.py
index ed3e336..2cd8eb2 100644
--- a/app/bot/routers/tonconnect.py
+++ b/app/bot/routers/tonconnect.py
@@ -83,8 +83,12 @@ async def t_callback_init_tonconnect(query: types.CallbackQuery, memory=None, us
         keyboard=get_inline_keyboard([
             [
                 {
-                    'text': 'Connect',
+                    'text': user.translated('tonconnectOpenWallet_button'),
                     'url': connection_link
+                },
+                {
+                    'text': user.translated('home_button'),
+                    'callback_data': 'home'
                 }
             ]
         ]), message_id=query.message.message_id
diff --git a/app/core/background/indexer_service.py b/app/core/background/indexer_service.py
index 1d52fe4..63078a3 100644
--- a/app/core/background/indexer_service.py
+++ b/app/core/background/indexer_service.py
@@ -68,7 +68,7 @@ async def indexer_loop(platform_found: bool, seqno: int) -> [bool, int]:
         item_license_type = int(item_get_data_result['stack'][4][1], 16)
         assert item_license_type == 0, "Item license type is not 0"
 
-        item_owner_address = Cell.one_from_boc(b64decode(item_get_data_result['stack'][5][1])).begin_parse().read_msg_addr()
+        item_owner_address = Cell.one_from_boc(b64decode(item_get_data_result['stack'][5][1])["bytes"]).begin_parse().read_msg_addr()
         item_values = Cell.one_from_boc(b64decode(item_get_data_result['stack'][6][1]['bytes']))
         item_derivates = Cell.one_from_boc(b64decode(item_get_data_result['stack'][7][1]['bytes']))
         item_platform_variables = Cell.one_from_boc(b64decode(item_get_data_result['stack'][8][1]['bytes']))