diff --git a/ydb/core/grpc_services/rpc_read_columns.cpp b/ydb/core/grpc_services/rpc_read_columns.cpp
index 2df1866b978e..f5cd670f72b6 100644
--- a/ydb/core/grpc_services/rpc_read_columns.cpp
+++ b/ydb/core/grpc_services/rpc_read_columns.cpp
@@ -325,13 +325,13 @@ class TReadColumnsRPC : public TActorBootstrapped<TReadColumnsRPC> {
                 *sysViewInfo->MutableSourceObject() = entry.SysViewInfo->Description.GetSourceObject();
             }
             auto tableScanActor = NSysView::CreateSystemViewScan(ctx.SelfID, 0,
+                Request->GetDatabaseName().GetOrElse({}),
+                sysViewInfo,
                 entry.TableId,
                 JoinPath(entry.Path),
-                sysViewInfo,
                 range,
                 columns,
                 Request->GetInternalToken(),
-                Request->GetDatabaseName().GetOrElse({}),
                 false);
 
             if (!tableScanActor) {
diff --git a/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp b/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp
index c30530481678..1066e274d18b 100644
--- a/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp
+++ b/ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp
@@ -132,8 +132,9 @@ void TKqpComputeActor::DoBootstrap() {
         if (Meta->GetTable().HasSysViewDescription()) {
             SysViewInfo = Meta->GetTable().GetSysViewDescription();
         }
-        auto scanActor = NSysView::CreateSystemViewScan(SelfId(), 0, ScanData->TableId, ScanData->TablePath, SysViewInfo,
-                                                        ranges, columns, UserToken, Database, reverse);
+        auto scanActor = NSysView::CreateSystemViewScan(SelfId(), 0, Database, SysViewInfo,
+                                                        ScanData->TableId, ScanData->TablePath,
+                                                        ranges, columns, UserToken, reverse);
 
         if (!scanActor) {
             ErrorFromIssue(TIssuesIds::DEFAULT_ERROR, TStringBuilder()
diff --git a/ydb/core/sys_view/auth/auth_scan_base.h b/ydb/core/sys_view/auth/auth_scan_base.h
index 1b0f386d05eb..7f12ad2eaa9f 100644
--- a/ydb/core/sys_view/auth/auth_scan_base.h
+++ b/ydb/core/sys_view/auth/auth_scan_base.h
@@ -48,11 +48,11 @@ class TAuthScanBase : public TScanActorBase<TDerived> {
     }
 
     TAuthScanBase(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
         TIntrusiveConstPtr<NACLib::TUserToken> userToken,
         bool requireUserAdministratorAccess, bool applyPathTableRange)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
         , UserToken(std::move(userToken))
         , RequireUserAdministratorAccess(requireUserAdministratorAccess)
     {
@@ -198,6 +198,7 @@ class TAuthScanBase : public TScanActorBase<TDerived> {
 
     void NavigatePath(TPath path) {
         auto request = MakeHolder<NSchemeCache::TSchemeCacheNavigate>();
+        request->DatabaseName = this->DatabaseName;
 
         auto& entry = request->ResultSet.emplace_back();
         entry.RequestType = TSchemeCacheNavigate::TEntry::ERequestType::ByPath;
diff --git a/ydb/core/sys_view/auth/group_members.cpp b/ydb/core/sys_view/auth/group_members.cpp
index c4d1b814c4af..daa1b8eeca9e 100644
--- a/ydb/core/sys_view/auth/group_members.cpp
+++ b/ydb/core/sys_view/auth/group_members.cpp
@@ -20,10 +20,10 @@ class TGroupMembersScan : public TAuthScanBase<TGroupMembersScan> {
     using TAuthBase = TAuthScanBase<TGroupMembersScan>;
 
     TGroupMembersScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
         TIntrusiveConstPtr<NACLib::TUserToken> userToken)
-        : TAuthBase(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken), true, false)
+        : TAuthBase(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken), true, false)
     {
     }
 
@@ -71,11 +71,11 @@ class TGroupMembersScan : public TAuthScanBase<TGroupMembersScan> {
 };
 
 THolder<NActors::IActor> CreateGroupMembersScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken)
 {
-    return MakeHolder<TGroupMembersScan>(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken));
+    return MakeHolder<TGroupMembersScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken));
 }
 
 }
diff --git a/ydb/core/sys_view/auth/group_members.h b/ydb/core/sys_view/auth/group_members.h
index f7e0d36f0613..ff516ee48440 100644
--- a/ydb/core/sys_view/auth/group_members.h
+++ b/ydb/core/sys_view/auth/group_members.h
@@ -9,8 +9,8 @@
 namespace NKikimr::NSysView::NAuth {
 
 THolder<NActors::IActor> CreateGroupMembersScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken);
 
 }
diff --git a/ydb/core/sys_view/auth/groups.cpp b/ydb/core/sys_view/auth/groups.cpp
index 54403a5cc2cf..782a726634b7 100644
--- a/ydb/core/sys_view/auth/groups.cpp
+++ b/ydb/core/sys_view/auth/groups.cpp
@@ -20,10 +20,10 @@ class TGroupsScan : public TAuthScanBase<TGroupsScan> {
     using TAuthBase = TAuthScanBase<TGroupsScan>;
 
     TGroupsScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
         TIntrusiveConstPtr<NACLib::TUserToken> userToken)
-        : TAuthBase(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken), true, false)
+        : TAuthBase(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken), true, false)
     {
     }
 
@@ -65,11 +65,11 @@ class TGroupsScan : public TAuthScanBase<TGroupsScan> {
 };
 
 THolder<NActors::IActor> CreateGroupsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken)
 {
-    return MakeHolder<TGroupsScan>(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken));
+    return MakeHolder<TGroupsScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken));
 }
 
 }
diff --git a/ydb/core/sys_view/auth/groups.h b/ydb/core/sys_view/auth/groups.h
index f9759f92cf03..b2fa776841d6 100644
--- a/ydb/core/sys_view/auth/groups.h
+++ b/ydb/core/sys_view/auth/groups.h
@@ -9,8 +9,8 @@
 namespace NKikimr::NSysView::NAuth {
 
 THolder<NActors::IActor> CreateGroupsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken);
 
 }
diff --git a/ydb/core/sys_view/auth/owners.cpp b/ydb/core/sys_view/auth/owners.cpp
index 8a31e772cc78..d721cc2aee73 100644
--- a/ydb/core/sys_view/auth/owners.cpp
+++ b/ydb/core/sys_view/auth/owners.cpp
@@ -20,10 +20,10 @@ class TOwnersScan : public TAuthScanBase<TOwnersScan> {
     using TAuthBase = TAuthScanBase<TOwnersScan>;
 
     TOwnersScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
         TIntrusiveConstPtr<NACLib::TUserToken> userToken)
-        : TAuthBase(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken), false, true)
+        : TAuthBase(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken), false, true)
     {
     }
 
@@ -63,11 +63,11 @@ class TOwnersScan : public TAuthScanBase<TOwnersScan> {
 };
 
 THolder<NActors::IActor> CreateOwnersScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken)
 {
-    return MakeHolder<TOwnersScan>(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken));
+    return MakeHolder<TOwnersScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken));
 }
 
 }
diff --git a/ydb/core/sys_view/auth/owners.h b/ydb/core/sys_view/auth/owners.h
index e922d97b7106..1fa5428efcef 100644
--- a/ydb/core/sys_view/auth/owners.h
+++ b/ydb/core/sys_view/auth/owners.h
@@ -9,8 +9,8 @@
 namespace NKikimr::NSysView::NAuth {
 
 THolder<NActors::IActor> CreateOwnersScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken);
 
 }
diff --git a/ydb/core/sys_view/auth/permissions.cpp b/ydb/core/sys_view/auth/permissions.cpp
index dcedd5198ff7..65f850df31d7 100644
--- a/ydb/core/sys_view/auth/permissions.cpp
+++ b/ydb/core/sys_view/auth/permissions.cpp
@@ -21,10 +21,10 @@ class TPermissionsScan : public TAuthScanBase<TPermissionsScan> {
     using TAuthBase = TAuthScanBase<TPermissionsScan>;
 
     TPermissionsScan(bool effective, const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
         TIntrusiveConstPtr<NACLib::TUserToken> userToken)
-        : TAuthBase(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken), false, true)
+        : TAuthBase(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken), false, true)
         , Effective(effective)
     {
     }
@@ -101,11 +101,11 @@ class TPermissionsScan : public TAuthScanBase<TPermissionsScan> {
 };
 
 THolder<NActors::IActor> CreatePermissionsScan(bool effective, const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken)
 {
-    return MakeHolder<TPermissionsScan>(effective, ownerId, scanId, sysViewInfo, tableRange, columns,
+    return MakeHolder<TPermissionsScan>(effective, ownerId, scanId, database, sysViewInfo, tableRange, columns,
         std::move(userToken));
 }
 
diff --git a/ydb/core/sys_view/auth/permissions.h b/ydb/core/sys_view/auth/permissions.h
index 517d2f2bc302..38dc3a683b68 100644
--- a/ydb/core/sys_view/auth/permissions.h
+++ b/ydb/core/sys_view/auth/permissions.h
@@ -9,8 +9,8 @@
 namespace NKikimr::NSysView::NAuth {
 
 THolder<NActors::IActor> CreatePermissionsScan(bool effective, const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken);
 
 }
diff --git a/ydb/core/sys_view/auth/users.cpp b/ydb/core/sys_view/auth/users.cpp
index d3fc381e715a..55a7a10cda26 100644
--- a/ydb/core/sys_view/auth/users.cpp
+++ b/ydb/core/sys_view/auth/users.cpp
@@ -20,10 +20,10 @@ class TUsersScan : public TScanActorBase<TUsersScan> {
     using TBase = TScanActorBase<TUsersScan>;
 
     TUsersScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
         TIntrusiveConstPtr<NACLib::TUserToken> userToken)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
         , UserToken(std::move(userToken))
     {
     }
@@ -176,11 +176,11 @@ class TUsersScan : public TScanActorBase<TUsersScan> {
 };
 
 THolder<NActors::IActor> CreateUsersScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken)
 {
-    return MakeHolder<TUsersScan>(ownerId, scanId, sysViewInfo, tableRange, columns, std::move(userToken));
+    return MakeHolder<TUsersScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns, std::move(userToken));
 }
 
 }
diff --git a/ydb/core/sys_view/auth/users.h b/ydb/core/sys_view/auth/users.h
index 72072eb173c8..a2757802ea5e 100644
--- a/ydb/core/sys_view/auth/users.h
+++ b/ydb/core/sys_view/auth/users.h
@@ -9,8 +9,8 @@
 namespace NKikimr::NSysView::NAuth {
 
 THolder<NActors::IActor> CreateUsersScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken);
 
 }
diff --git a/ydb/core/sys_view/common/processor_scan.h b/ydb/core/sys_view/common/processor_scan.h
index 6d86329968e6..a898d8b145f8 100644
--- a/ydb/core/sys_view/common/processor_scan.h
+++ b/ydb/core/sys_view/common/processor_scan.h
@@ -26,10 +26,10 @@ class TProcessorScan : public TScanActorBase<
     }
 
     TProcessorScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
         NKikimrSysView::EStatsType type)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
     {
         ConvertKeyRange<TRequest, T...>(Request, this->TableRange);
         Request.SetType(type);
diff --git a/ydb/core/sys_view/common/scan_actor_base_impl.h b/ydb/core/sys_view/common/scan_actor_base_impl.h
index e57199c63dc4..6973a4e5ca20 100644
--- a/ydb/core/sys_view/common/scan_actor_base_impl.h
+++ b/ydb/core/sys_view/common/scan_actor_base_impl.h
@@ -29,10 +29,11 @@ class TScanActorBase : public TActorBootstrapped<TDerived> {
     using TBase = TActorBootstrapped<TDerived>;
 
     TScanActorBase(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
         : OwnerActorId(ownerId)
         , ScanId(scanId)
+        , DatabaseName(database)
         , SysViewInfo(sysViewInfo)
         , TableRange(tableRange)
         , Columns(columns.begin(), columns.end())
@@ -257,9 +258,10 @@ class TScanActorBase : public TActorBootstrapped<TDerived> {
         using TNavigate = NSchemeCache::TSchemeCacheNavigate;
 
         auto request = MakeHolder<TNavigate>();
+        request->DatabaseName = DatabaseName;
         request->ResultSet.push_back({});
-        auto& entry = request->ResultSet.back();
 
+        auto& entry = request->ResultSet.back();
         entry.TableId = TPathId::FromProto(SysViewInfo.GetSourceObject());
         entry.Operation = TNavigate::EOp::OpPath;
         entry.RequestType = TNavigate::TEntry::ERequestType::ByTableId;
@@ -295,9 +297,9 @@ class TScanActorBase : public TActorBootstrapped<TDerived> {
             HiveId = AppData()->DomainsInfo->GetHive();
         }
 
+        TenantName = CanonizePath(entry.Path);
         DomainKey = entry.DomainInfo->DomainKey;
 
-        TenantName = CanonizePath(entry.Path);
         DatabaseOwner = entry.Self->Info.GetOwner();
         Y_ABORT_UNLESS(entry.Self->Info.GetOwner() == entry.SecurityObject->GetOwnerSID());
 
@@ -367,7 +369,10 @@ class TScanActorBase : public TActorBootstrapped<TDerived> {
 
     const NActors::TActorId OwnerActorId;
     const ui32 ScanId;
+
+    const TString DatabaseName;
     const NKikimrSysView::TSysViewDescription SysViewInfo;
+
     TSerializedTableRange TableRange;
     TSmallVec<NMiniKQL::TKqpComputeContextBase::TColumn> Columns;
 
diff --git a/ydb/core/sys_view/compile_cache/compile_cache.cpp b/ydb/core/sys_view/compile_cache/compile_cache.cpp
index 08d6549202a5..5d269c82a101 100644
--- a/ydb/core/sys_view/compile_cache/compile_cache.cpp
+++ b/ydb/core/sys_view/compile_cache/compile_cache.cpp
@@ -78,9 +78,9 @@ class TCompileCacheQueriesScan : public NKikimr::NSysView::TScanActorBase<TCompi
     };
 
     TCompileCacheQueriesScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
     {
         const auto& cellsFrom = TableRange.From.GetCells();
         if (cellsFrom.size() > 1 && !cellsFrom[1].IsNull()) {
@@ -289,10 +289,10 @@ class TCompileCacheQueriesScan : public NKikimr::NSysView::TScanActorBase<TCompi
     NKikimrKqp::TEvListCompileCacheQueriesResponse LastResponse;
     };
 THolder<NActors::IActor> CreateCompileCacheQueriesScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TCompileCacheQueriesScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
+    return MakeHolder<TCompileCacheQueriesScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
 }
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/compile_cache/compile_cache.h b/ydb/core/sys_view/compile_cache/compile_cache.h
index d6d212e3dce2..d009ee666358 100644
--- a/ydb/core/sys_view/compile_cache/compile_cache.h
+++ b/ydb/core/sys_view/compile_cache/compile_cache.h
@@ -9,7 +9,7 @@
 namespace NKikimr::NSysView {
 
 THolder<NActors::IActor> CreateCompileCacheQueriesScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/nodes/nodes.cpp b/ydb/core/sys_view/nodes/nodes.cpp
index 1c9599a7bf56..6aaa6258614b 100644
--- a/ydb/core/sys_view/nodes/nodes.cpp
+++ b/ydb/core/sys_view/nodes/nodes.cpp
@@ -26,9 +26,9 @@ class TNodesScan : public TScanActorBase<TNodesScan> {
     }
 
     TNodesScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
     {
         const auto& cellsFrom = TableRange.From.GetCells();
         if (cellsFrom.size() == 1 && !cellsFrom[0].IsNull()) {
@@ -276,10 +276,10 @@ class TNodesScan : public TScanActorBase<TNodesScan> {
 };
 
 THolder<NActors::IActor> CreateNodesScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TNodesScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
+    return MakeHolder<TNodesScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
 }
 
 } // NSysView
diff --git a/ydb/core/sys_view/nodes/nodes.h b/ydb/core/sys_view/nodes/nodes.h
index 8f9f12e13804..327fcc56a32f 100644
--- a/ydb/core/sys_view/nodes/nodes.h
+++ b/ydb/core/sys_view/nodes/nodes.h
@@ -10,8 +10,8 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreateNodesScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/partition_stats/partition_stats.cpp b/ydb/core/sys_view/partition_stats/partition_stats.cpp
index 63e3afaefb62..4ce987974451 100644
--- a/ydb/core/sys_view/partition_stats/partition_stats.cpp
+++ b/ydb/core/sys_view/partition_stats/partition_stats.cpp
@@ -596,9 +596,9 @@ class TPartitionStatsScan : public TScanActorBase<TPartitionStatsScan> {
     }
 
     TPartitionStatsScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
     {
         auto extractKey = [] (NKikimrSysView::TPartitionStatsKey& key, const TConstArrayRef<TCell>& cells) {
             if (cells.size() > 0 && !cells[0].IsNull()) {
@@ -862,10 +862,10 @@ class TPartitionStatsScan : public TScanActorBase<TPartitionStatsScan> {
 };
 
 THolder<NActors::IActor> CreatePartitionStatsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TPartitionStatsScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
+    return MakeHolder<TPartitionStatsScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
 }
 
 } // NSysView
diff --git a/ydb/core/sys_view/partition_stats/partition_stats.h b/ydb/core/sys_view/partition_stats/partition_stats.h
index bfc6c18375ed..fd6f2460a379 100644
--- a/ydb/core/sys_view/partition_stats/partition_stats.h
+++ b/ydb/core/sys_view/partition_stats/partition_stats.h
@@ -17,8 +17,8 @@ THolder<NActors::IActor> CreatePartitionStatsCollector(
     size_t pendingRequestsCount = STATS_COLLECTOR_QUEUE_SIZE_LIMIT);
 
 THolder<NActors::IActor> CreatePartitionStatsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/partition_stats/top_partitions.cpp b/ydb/core/sys_view/partition_stats/top_partitions.cpp
index 0c3d34ac309e..79330754d15a 100644
--- a/ydb/core/sys_view/partition_stats/top_partitions.cpp
+++ b/ydb/core/sys_view/partition_stats/top_partitions.cpp
@@ -117,8 +117,8 @@ struct TTopPartitionsByTliExtractorMap :
 };
 
 THolder<NActors::IActor> CreateTopPartitionsByCpuScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     using TTopPartitionsByCpuScan = TProcessorScan<
         NKikimrSysView::TTopPartitionsEntry,
@@ -139,12 +139,12 @@ THolder<NActors::IActor> CreateTopPartitionsByCpuScan(const NActors::TActorId& o
     auto statusIter = nameToStatus.find(sysViewInfo.GetType());
     Y_ABORT_UNLESS(statusIter != nameToStatus.end());
 
-    return MakeHolder<TTopPartitionsByCpuScan>(ownerId, scanId, sysViewInfo, tableRange, columns, statusIter->second);
+    return MakeHolder<TTopPartitionsByCpuScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns, statusIter->second);
 }
 
 THolder<NActors::IActor> CreateTopPartitionsByTliScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     using TTopPartitionsByTliScan = TProcessorScan<
         NKikimrSysView::TTopPartitionsEntry,
@@ -165,7 +165,7 @@ THolder<NActors::IActor> CreateTopPartitionsByTliScan(const NActors::TActorId& o
     auto statusIter = nameToStatus.find(sysViewInfo.GetType());
     Y_ABORT_UNLESS(statusIter != nameToStatus.end());
 
-    return MakeHolder<TTopPartitionsByTliScan>(ownerId, scanId, sysViewInfo, tableRange, columns, statusIter->second);
+    return MakeHolder<TTopPartitionsByTliScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns, statusIter->second);
 }
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/partition_stats/top_partitions.h b/ydb/core/sys_view/partition_stats/top_partitions.h
index 323f1c399942..d88bd1669105 100644
--- a/ydb/core/sys_view/partition_stats/top_partitions.h
+++ b/ydb/core/sys_view/partition_stats/top_partitions.h
@@ -9,10 +9,10 @@
 namespace NKikimr::NSysView {
 
 THolder<NActors::IActor> CreateTopPartitionsByCpuScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 THolder<NActors::IActor> CreateTopPartitionsByTliScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/pg_tables/pg_tables.cpp b/ydb/core/sys_view/pg_tables/pg_tables.cpp
index f16f2f74d956..0ed25f0c8db9 100644
--- a/ydb/core/sys_view/pg_tables/pg_tables.cpp
+++ b/ydb/core/sys_view/pg_tables/pg_tables.cpp
@@ -162,6 +162,7 @@ void TPgTablesScanBase::StateWork(TAutoPtr<IEventHandle>& ev) {
 }
 
 TPgTablesScanBase::TPgTablesScanBase(const NActors::TActorId &ownerId, ui32 scanId,
+    const TString& database,
     const NKikimrSysView::TSysViewDescription& sysViewInfo,
     const TString& tablePath,
     const TTableRange &tableRange,
@@ -169,7 +170,7 @@ TPgTablesScanBase::TPgTablesScanBase(const NActors::TActorId &ownerId, ui32 scan
     const TVector<Schema::PgColumn>& schemaColumns,
     THashMap<TString, TRowFiller>&& fillers,
     THashMap<TString, TStaticRowFiller>&& staticFillers)
-    : NKikimr::NSysView::TScanActorBase<TPgTablesScanBase>(ownerId, scanId, sysViewInfo, tableRange, columns),
+    : NKikimr::NSysView::TScanActorBase<TPgTablesScanBase>(ownerId, scanId, database, sysViewInfo, tableRange, columns),
       TablePath_(tablePath),
       SchemaColumns_(schemaColumns),
       Fillers_(std::move(fillers)),
@@ -178,6 +179,7 @@ TPgTablesScanBase::TPgTablesScanBase(const NActors::TActorId &ownerId, ui32 scan
 
 TPgTablesScan::TPgTablesScan(
     const NActors::TActorId &ownerId, ui32 scanId,
+    const TString& database,
     const NKikimrSysView::TSysViewDescription& sysViewInfo,
     const TString& tablePath,
     const TTableRange &tableRange,
@@ -185,6 +187,7 @@ TPgTablesScan::TPgTablesScan(
     : TPgTablesScanBase(
         ownerId,
         scanId,
+        database,
         sysViewInfo,
         tablePath,
         tableRange,
@@ -224,6 +227,7 @@ TPgTablesScan::TPgTablesScan(
 
 TInformationSchemaTablesScan::TInformationSchemaTablesScan(
     const NActors::TActorId &ownerId, ui32 scanId,
+    const TString& database,
     const NKikimrSysView::TSysViewDescription& sysViewInfo,
     const TString& tablePath,
     const TTableRange &tableRange,
@@ -231,6 +235,7 @@ TInformationSchemaTablesScan::TInformationSchemaTablesScan(
     : TPgTablesScanBase(
         ownerId,
         scanId,
+        database,
         sysViewInfo,
         tablePath,
         tableRange,
@@ -255,6 +260,7 @@ TInformationSchemaTablesScan::TInformationSchemaTablesScan(
 
 TPgClassScan::TPgClassScan(
     const NActors::TActorId &ownerId, ui32 scanId,
+    const TString& database,
     const NKikimrSysView::TSysViewDescription& sysViewInfo,
     const TString& tablePath,
     const TTableRange &tableRange,
@@ -262,6 +268,7 @@ TPgClassScan::TPgClassScan(
     : TPgTablesScanBase(
         ownerId,
         scanId,
+        database,
         sysViewInfo,
         tablePath,
         tableRange,
@@ -321,24 +328,27 @@ TPgClassScan::TPgClassScan(
 }
 
 THolder<NActors::IActor> CreatePgTablesScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TString& tablePath,
-    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TString& tablePath, const TTableRange& tableRange,
+    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TPgTablesScan>(ownerId, scanId, sysViewInfo, tablePath, tableRange, columns);
+    return MakeHolder<TPgTablesScan>(ownerId, scanId, database, sysViewInfo, tablePath, tableRange, columns);
 }
 
 THolder<NActors::IActor> CreateInformationSchemaTablesScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TString& tablePath,
-    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TString& tablePath, const TTableRange& tableRange,
+    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TInformationSchemaTablesScan>(ownerId, scanId, sysViewInfo, tablePath, tableRange, columns);
+    return MakeHolder<TInformationSchemaTablesScan>(ownerId, scanId, database, sysViewInfo, tablePath, tableRange, columns);
 }
 
 THolder<NActors::IActor> CreatePgClassScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TString& tablePath,
-    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TString& tablePath, const TTableRange& tableRange,
+    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TPgClassScan>(ownerId, scanId, sysViewInfo, tablePath, tableRange, columns);
+    return MakeHolder<TPgClassScan>(ownerId, scanId, database, sysViewInfo, tablePath, tableRange, columns);
 }
 
 } // NSysView
diff --git a/ydb/core/sys_view/pg_tables/pg_tables.h b/ydb/core/sys_view/pg_tables/pg_tables.h
index b7c0446c4df0..43b4ab9fe7a7 100644
--- a/ydb/core/sys_view/pg_tables/pg_tables.h
+++ b/ydb/core/sys_view/pg_tables/pg_tables.h
@@ -26,6 +26,7 @@ class TPgTablesScanBase : public NKikimr::NSysView::TScanActorBase<TPgTablesScan
     TPgTablesScanBase(
         const NActors::TActorId& ownerId,
         ui32 scanId,
+        const TString& database,
         const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TString& tablePath,
         const TTableRange& tableRange,
@@ -49,35 +50,41 @@ class TPgTablesScanBase : public NKikimr::NSysView::TScanActorBase<TPgTablesScan
 class TPgTablesScan : public TPgTablesScanBase {
 public:
     TPgTablesScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo, const TString& tablePath,
-        const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& tablePath, const TTableRange& tableRange,
+        const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 };
 class TInformationSchemaTablesScan : public TPgTablesScanBase {
 public:
     TInformationSchemaTablesScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo, const TString& tablePath,
-        const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& tablePath, const TTableRange& tableRange,
+        const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 };
 
 class TPgClassScan : public TPgTablesScanBase {
 public:
     TPgClassScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo, const TString& tablePath,
-        const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& tablePath, const TTableRange& tableRange,
+        const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 private:
     THashMap<TString, ui32> namespaces;
     ui32 btreeAmOid;
 };
 
 THolder<NActors::IActor> CreatePgTablesScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TString& tablePath,
-    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TString& tablePath, const TTableRange& tableRange,
+    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 THolder<NActors::IActor> CreateInformationSchemaTablesScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TString& tablePath,
-    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TString& tablePath, const TTableRange& tableRange,
+    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 THolder<NActors::IActor> CreatePgClassScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TString& tablePath,
-    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TString& tablePath, const TTableRange& tableRange,
+    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 
 } // NSysView
diff --git a/ydb/core/sys_view/processor/db_counters.cpp b/ydb/core/sys_view/processor/db_counters.cpp
index 3cbf5a65b3a9..588d30ac3b6d 100644
--- a/ydb/core/sys_view/processor/db_counters.cpp
+++ b/ydb/core/sys_view/processor/db_counters.cpp
@@ -284,6 +284,7 @@ void TSysViewProcessor::SendNavigate() {
 
     using TNavigate = NSchemeCache::TSchemeCacheNavigate;
     auto request = MakeHolder<TNavigate>();
+    request->DatabaseName = Database;
     request->ResultSet.push_back({});
 
     auto& entry = request->ResultSet.back();
diff --git a/ydb/core/sys_view/query_stats/query_metrics.cpp b/ydb/core/sys_view/query_stats/query_metrics.cpp
index a5cb54dfec24..d30cbe73a2f8 100644
--- a/ydb/core/sys_view/query_stats/query_metrics.cpp
+++ b/ydb/core/sys_view/query_stats/query_metrics.cpp
@@ -63,8 +63,8 @@ struct TQueryMetricsExtractorsMap :
 };
 
 THolder<NActors::IActor> CreateQueryMetricsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     using TQueryMetricsScan = TProcessorScan<
         NKikimrSysView::TQueryMetricsEntry,
@@ -77,7 +77,7 @@ THolder<NActors::IActor> CreateQueryMetricsScan(const NActors::TActorId& ownerId
         ui32
     >;
 
-    return MakeHolder<TQueryMetricsScan>(ownerId, scanId, sysViewInfo, tableRange, columns,
+    return MakeHolder<TQueryMetricsScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
         NKikimrSysView::METRICS_ONE_MINUTE);
 }
 
diff --git a/ydb/core/sys_view/query_stats/query_metrics.h b/ydb/core/sys_view/query_stats/query_metrics.h
index d56ed23a0419..142504b3f969 100644
--- a/ydb/core/sys_view/query_stats/query_metrics.h
+++ b/ydb/core/sys_view/query_stats/query_metrics.h
@@ -10,8 +10,8 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreateQueryMetricsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/query_stats/query_stats.cpp b/ydb/core/sys_view/query_stats/query_stats.cpp
index e0871a3d0fd4..6371197b2f79 100644
--- a/ydb/core/sys_view/query_stats/query_stats.cpp
+++ b/ydb/core/sys_view/query_stats/query_stats.cpp
@@ -101,11 +101,11 @@ class TQueryStatsScan : public TScanActorBase<TQueryStatsScan<TGreater>> {
     }
 
     TQueryStatsScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
         NKikimrSysView::EStatsType statsType,
         ui64 bucketCount, const TDuration& bucketSize)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
         , StatsType(statsType)
         , BucketRange(this->TableRange, bucketSize)
     {
@@ -509,40 +509,40 @@ class TQueryStatsScan : public TScanActorBase<TQueryStatsScan<TGreater>> {
 };
 
 THolder<NActors::IActor> CreateQueryStatsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
     switch (sysViewInfo.GetType()) {
     case ESysViewType::ETopQueriesByDurationOneMinute:
-        return MakeHolder<TQueryStatsScan<TDurationGreater>>(ownerId, scanId, sysViewInfo, tableRange, columns,
+        return MakeHolder<TQueryStatsScan<TDurationGreater>>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
             NKikimrSysView::TOP_DURATION_ONE_MINUTE,
             ONE_MINUTE_BUCKET_COUNT, ONE_MINUTE_BUCKET_SIZE);
     case ESysViewType::ETopQueriesByDurationOneHour:
-        return MakeHolder<TQueryStatsScan<TDurationGreater>>(ownerId, scanId, sysViewInfo, tableRange, columns,
+        return MakeHolder<TQueryStatsScan<TDurationGreater>>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
             NKikimrSysView::TOP_DURATION_ONE_HOUR,
             ONE_HOUR_BUCKET_COUNT, ONE_HOUR_BUCKET_SIZE);
     case ESysViewType::ETopQueriesByReadBytesOneMinute:
-        return MakeHolder<TQueryStatsScan<TReadBytesGreater>>(ownerId, scanId, sysViewInfo, tableRange, columns,
+        return MakeHolder<TQueryStatsScan<TReadBytesGreater>>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
             NKikimrSysView::TOP_READ_BYTES_ONE_MINUTE,
             ONE_MINUTE_BUCKET_COUNT, ONE_MINUTE_BUCKET_SIZE);
     case ESysViewType::ETopQueriesByReadBytesOneHour:
-        return MakeHolder<TQueryStatsScan<TReadBytesGreater>>(ownerId, scanId, sysViewInfo, tableRange, columns,
+        return MakeHolder<TQueryStatsScan<TReadBytesGreater>>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
             NKikimrSysView::TOP_READ_BYTES_ONE_HOUR,
             ONE_HOUR_BUCKET_COUNT, ONE_HOUR_BUCKET_SIZE);
     case ESysViewType::ETopQueriesByCpuTimeOneMinute:
-        return MakeHolder<TQueryStatsScan<TCpuTimeGreater>>(ownerId, scanId, sysViewInfo, tableRange, columns,
+        return MakeHolder<TQueryStatsScan<TCpuTimeGreater>>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
             NKikimrSysView::TOP_CPU_TIME_ONE_MINUTE,
             ONE_MINUTE_BUCKET_COUNT, ONE_MINUTE_BUCKET_SIZE);
     case ESysViewType::ETopQueriesByCpuTimeOneHour:
-        return MakeHolder<TQueryStatsScan<TCpuTimeGreater>>(ownerId, scanId, sysViewInfo, tableRange, columns,
+        return MakeHolder<TQueryStatsScan<TCpuTimeGreater>>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
             NKikimrSysView::TOP_CPU_TIME_ONE_HOUR,
             ONE_HOUR_BUCKET_COUNT, ONE_HOUR_BUCKET_SIZE);
     case ESysViewType::ETopQueriesByRequestUnitsOneMinute:
-        return MakeHolder<TQueryStatsScan<TRequestUnitsGreater>>(ownerId, scanId, sysViewInfo, tableRange, columns,
+        return MakeHolder<TQueryStatsScan<TRequestUnitsGreater>>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
             NKikimrSysView::TOP_REQUEST_UNITS_ONE_MINUTE,
             ONE_MINUTE_BUCKET_COUNT, ONE_MINUTE_BUCKET_SIZE);
     case ESysViewType::ETopQueriesByRequestUnitsOneHour:
-        return MakeHolder<TQueryStatsScan<TRequestUnitsGreater>>(ownerId, scanId, sysViewInfo, tableRange, columns,
+        return MakeHolder<TQueryStatsScan<TRequestUnitsGreater>>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
             NKikimrSysView::TOP_REQUEST_UNITS_ONE_HOUR,
             ONE_HOUR_BUCKET_COUNT, ONE_HOUR_BUCKET_SIZE);
     default:
diff --git a/ydb/core/sys_view/query_stats/query_stats.h b/ydb/core/sys_view/query_stats/query_stats.h
index 4a777d8fb508..77d2e950ee85 100644
--- a/ydb/core/sys_view/query_stats/query_stats.h
+++ b/ydb/core/sys_view/query_stats/query_stats.h
@@ -22,8 +22,8 @@ struct TQueryStatsBucketRange {
 };
 
 THolder<NActors::IActor> CreateQueryStatsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/resource_pool_classifiers/resource_pool_classifiers.cpp b/ydb/core/sys_view/resource_pool_classifiers/resource_pool_classifiers.cpp
index b61849d81bdb..485298e871ef 100644
--- a/ydb/core/sys_view/resource_pool_classifiers/resource_pool_classifiers.cpp
+++ b/ydb/core/sys_view/resource_pool_classifiers/resource_pool_classifiers.cpp
@@ -33,12 +33,11 @@ class TResourcePoolClassifiersScan : public TScanActorBase<TResourcePoolClassifi
     }
 
     TResourcePoolClassifiersScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
-        TIntrusiveConstPtr<NACLib::TUserToken> userToken, const TString& database, bool reverse)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
+        TIntrusiveConstPtr<NACLib::TUserToken> userToken, bool reverse)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
         , UserToken(std::move(userToken))
-        , Database(database)
         , Reverse(reverse)
     {}
 
@@ -74,7 +73,7 @@ class TResourcePoolClassifiersScan : public TScanActorBase<TResourcePoolClassifi
         if (!NMetadata::NProvider::TServiceOperator::IsEnabled()) {
             ReplyEmptyAndDie();
         }
-        Register(NKqp::NWorkload::CreateDatabaseFetcherActor(SelfId(), Database, UserToken, NACLib::EAccessRights::GenericFull));
+        Register(NKqp::NWorkload::CreateDatabaseFetcherActor(SelfId(), TenantName, UserToken, NACLib::EAccessRights::GenericFull));
     }
 
     void Handle(NKqp::TEvKqpCompute::TEvScanDataAck::TPtr&) {
@@ -87,7 +86,7 @@ class TResourcePoolClassifiersScan : public TScanActorBase<TResourcePoolClassifi
             ReplyErrorAndDie(event.Status, event.Issues.ToOneLineString());
             return;
         }
-        Database = event.DatabaseId;
+        DatabaseId = event.DatabaseId;
         Send(NMetadata::NProvider::MakeServiceId(SelfId().NodeId()), new NMetadata::NProvider::TEvAskSnapshot(std::make_shared<NKqp::TResourcePoolClassifierSnapshotsFetcher>()));
     }
 
@@ -117,7 +116,7 @@ class TResourcePoolClassifiersScan : public TScanActorBase<TResourcePoolClassifi
 
         const auto& snapshot = ev->Get()->GetSnapshotAs<NKqp::TResourcePoolClassifierSnapshot>();
         const auto& config = snapshot->GetResourcePoolClassifierConfigs();
-        auto resourcePoolsIt = config.find(Database);
+        auto resourcePoolsIt = config.find(DatabaseId);
         if (resourcePoolsIt == config.end()) {
             ReplyEmptyAndDie();
             return;
@@ -150,17 +149,17 @@ class TResourcePoolClassifiersScan : public TScanActorBase<TResourcePoolClassifi
 
 private:
     const TIntrusiveConstPtr<NACLib::TUserToken> UserToken;
-    TString Database;
     const bool Reverse;
+    TString DatabaseId;
 };
 
 THolder<NActors::IActor> CreateResourcePoolClassifiersScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
-    TIntrusiveConstPtr<NACLib::TUserToken> userToken, const TString& database, bool reverse)
+    TIntrusiveConstPtr<NACLib::TUserToken> userToken, bool reverse)
 {
-    return MakeHolder<TResourcePoolClassifiersScan>(ownerId, scanId, sysViewInfo, tableRange, columns,
-        std::move(userToken), database, reverse);
+    return MakeHolder<TResourcePoolClassifiersScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
+        std::move(userToken), reverse);
 }
 
 } // NSysView
diff --git a/ydb/core/sys_view/resource_pool_classifiers/resource_pool_classifiers.h b/ydb/core/sys_view/resource_pool_classifiers/resource_pool_classifiers.h
index 8420d2c5cfe5..524cca380ad2 100644
--- a/ydb/core/sys_view/resource_pool_classifiers/resource_pool_classifiers.h
+++ b/ydb/core/sys_view/resource_pool_classifiers/resource_pool_classifiers.h
@@ -10,9 +10,9 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreateResourcePoolClassifiersScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
-    TIntrusiveConstPtr<NACLib::TUserToken> userToken, const TString& database, bool reverse);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    TIntrusiveConstPtr<NACLib::TUserToken> userToken, bool reverse);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/resource_pools/resource_pools.cpp b/ydb/core/sys_view/resource_pools/resource_pools.cpp
index 760e5dbc118a..e5cbb7d001a0 100644
--- a/ydb/core/sys_view/resource_pools/resource_pools.cpp
+++ b/ydb/core/sys_view/resource_pools/resource_pools.cpp
@@ -37,12 +37,11 @@ class TResourcePoolsScan : public TScanActorBase<TResourcePoolsScan> {
     }
 
     TResourcePoolsScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
-        TIntrusiveConstPtr<NACLib::TUserToken> userToken, const TString& database, bool reverse)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
+        TIntrusiveConstPtr<NACLib::TUserToken> userToken, bool reverse)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
         , UserToken(std::move(userToken))
-        , Database(database)
         , Reverse(reverse)
     {
     }
@@ -75,7 +74,7 @@ class TResourcePoolsScan : public TScanActorBase<TResourcePoolsScan> {
     void SendRequestToSchemeCache(const TVector<TVector<TString>>& pathsComponents, NSchemeCache::TSchemeCacheNavigate::EOp operation) {
         auto event = NTableCreator::BuildSchemeCacheNavigateRequest(
             pathsComponents,
-            Database,
+            DatabaseName,
             UserToken
         );
         for (auto& resultSet : event->ResultSet) {
@@ -245,17 +244,16 @@ class TResourcePoolsScan : public TScanActorBase<TResourcePoolsScan> {
 private:
     EState State = EState::LIST_RESOURCE_POOLS;
     const TIntrusiveConstPtr<NACLib::TUserToken> UserToken;
-    const TString Database;
     const bool Reverse;
 };
 
 THolder<NActors::IActor> CreateResourcePoolsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
-    TIntrusiveConstPtr<NACLib::TUserToken> userToken, const TString& database, bool reverse)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    TIntrusiveConstPtr<NACLib::TUserToken> userToken, bool reverse)
 {
-    return MakeHolder<TResourcePoolsScan>(ownerId, scanId, sysViewInfo, tableRange, columns,
-        std::move(userToken), database, reverse);
+    return MakeHolder<TResourcePoolsScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
+        std::move(userToken), reverse);
 }
 
 } // NSysView
diff --git a/ydb/core/sys_view/resource_pools/resource_pools.h b/ydb/core/sys_view/resource_pools/resource_pools.h
index a9a730498f63..e6e249232410 100644
--- a/ydb/core/sys_view/resource_pools/resource_pools.h
+++ b/ydb/core/sys_view/resource_pools/resource_pools.h
@@ -10,9 +10,9 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreateResourcePoolsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
-    TIntrusiveConstPtr<NACLib::TUserToken> userToken, const TString& database, bool reverse);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    TIntrusiveConstPtr<NACLib::TUserToken> userToken, bool reverse);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/scan.cpp b/ydb/core/sys_view/scan.cpp
index feb7052d2557..626573d37859 100644
--- a/ydb/core/sys_view/scan.cpp
+++ b/ydb/core/sys_view/scan.cpp
@@ -43,13 +43,13 @@ class TSysViewRangesReader : public TActor<TSysViewRangesReader> {
     TSysViewRangesReader(
         const NActors::TActorId& ownerId,
         ui32 scanId,
+        const TString& database,
+        const TMaybe<NKikimrSysView::TSysViewDescription>& sysViewInfo,
         const TTableId& tableId,
         const TString& tablePath,
-        const TMaybe<NKikimrSysView::TSysViewDescription>& sysViewInfo,
         TVector<TSerializedTableRange> ranges,
         const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
         TIntrusiveConstPtr<NACLib::TUserToken> userToken,
-        const TString& database,
         bool reverse)
         : TBase(&TSysViewRangesReader::ScanState)
         , OwnerId(ownerId)
@@ -95,8 +95,8 @@ class TSysViewRangesReader : public TActor<TSysViewRangesReader> {
         if (!ScanActorId) {
             if (CurrentRange < Ranges.size()) {
                 auto actor = CreateSystemViewScan(
-                    SelfId(), ScanId, TableId, TablePath, SysViewInfo, Ranges[CurrentRange].ToTableRange(),
-                    Columns, UserToken, Database, Reverse);
+                    SelfId(), ScanId, Database, SysViewInfo, TableId, TablePath, Ranges[CurrentRange].ToTableRange(),
+                    Columns, UserToken, Reverse);
                 ScanActorId = Register(actor.Release());
                 CurrentRange += 1;
             } else {
@@ -171,34 +171,34 @@ class TSysViewRangesReader : public TActor<TSysViewRangesReader> {
 THolder<NActors::IActor> CreateSystemViewScan(
     const NActors::TActorId& ownerId,
     ui32 scanId,
+    const TString& database,
+    const TMaybe<NKikimrSysView::TSysViewDescription>& sysViewInfo,
     const TTableId& tableId,
     const TString& tablePath,
-    const TMaybe<NKikimrSysView::TSysViewDescription>& sysViewInfo,
     TVector<TSerializedTableRange> ranges,
     const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken,
-    const TString& database,
     bool reverse
 ) {
     if (ranges.size() == 1) {
-        return CreateSystemViewScan(ownerId, scanId, tableId, tablePath, sysViewInfo, ranges[0].ToTableRange(),
-                                    columns, std::move(userToken), database, reverse);
+        return CreateSystemViewScan(ownerId, scanId, database, sysViewInfo, tableId, tablePath, ranges[0].ToTableRange(),
+                                    columns, std::move(userToken), reverse);
     } else {
-        return MakeHolder<TSysViewRangesReader>(ownerId, scanId, tableId, tablePath, sysViewInfo, ranges,
-                                                columns, std::move(userToken), database, reverse);
+        return MakeHolder<TSysViewRangesReader>(ownerId, scanId, database, sysViewInfo, tableId, tablePath, ranges,
+                                                columns, std::move(userToken), reverse);
     }
 }
 
 THolder<NActors::IActor> CreateSystemViewScan(
     const NActors::TActorId& ownerId,
     ui32 scanId,
+    const TString& database,
+    const TMaybe<NKikimrSysView::TSysViewDescription>& sysViewInfo,
     const TTableId& tableId,
     const TString& tablePath,
-    const TMaybe<NKikimrSysView::TSysViewDescription>& sysViewInfo,
     const TTableRange& tableRange,
     const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken,
-    const TString& database,
     bool reverse
 ) {
     NKikimrSysView::TSysViewDescription sysViewDescription;
@@ -213,13 +213,13 @@ THolder<NActors::IActor> CreateSystemViewScan(
 
     switch (sysViewDescription.GetType()) {
     case ESysViewType::EPartitionStats:
-        return CreatePartitionStatsScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreatePartitionStatsScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::ENodes:
-        return CreateNodesScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreateNodesScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::EQuerySessions:
-        return CreateSessionsScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreateSessionsScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::ECompileCacheQueries:
-        return CreateCompileCacheQueriesScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreateCompileCacheQueriesScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::ETopQueriesByDurationOneMinute:
     case ESysViewType::ETopQueriesByDurationOneHour:
     case ESysViewType::ETopQueriesByReadBytesOneMinute:
@@ -228,52 +228,53 @@ THolder<NActors::IActor> CreateSystemViewScan(
     case ESysViewType::ETopQueriesByCpuTimeOneHour:
     case ESysViewType::ETopQueriesByRequestUnitsOneMinute:
     case ESysViewType::ETopQueriesByRequestUnitsOneHour:
-        return CreateQueryStatsScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreateQueryStatsScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::EPDisks:
-        return CreatePDisksScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreatePDisksScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::EVSlots:
-        return CreateVSlotsScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreateVSlotsScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::EGroups:
-        return CreateGroupsScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreateGroupsScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::EStoragePools:
-        return CreateStoragePoolsScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreateStoragePoolsScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::EStorageStats:
-        return CreateStorageStatsScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreateStorageStatsScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::ETablets:
-         return CreateTabletsScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+         return CreateTabletsScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::EQueryMetricsOneMinute:
-        return CreateQueryMetricsScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreateQueryMetricsScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::ETopPartitionsByCpuOneMinute:
     case ESysViewType::ETopPartitionsByCpuOneHour:
-        return CreateTopPartitionsByCpuScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreateTopPartitionsByCpuScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::ETopPartitionsByTliOneMinute:
     case ESysViewType::ETopPartitionsByTliOneHour:
-        return CreateTopPartitionsByTliScan(ownerId, scanId, sysViewDescription, tableRange, columns);
+        return CreateTopPartitionsByTliScan(ownerId, scanId, database, sysViewDescription, tableRange, columns);
     case ESysViewType::EPgTables:
-        return CreatePgTablesScan(ownerId, scanId, sysViewDescription, tablePath, tableRange, columns);
+        return CreatePgTablesScan(ownerId, scanId, database, sysViewDescription, tablePath, tableRange, columns);
     case ESysViewType::EInformationSchemaTables:
-        return CreateInformationSchemaTablesScan(ownerId, scanId, sysViewDescription, tablePath, tableRange, columns);
+        return CreateInformationSchemaTablesScan(ownerId, scanId, database, sysViewDescription, tablePath, tableRange, columns);
     case ESysViewType::EPgClass:
-        return CreatePgClassScan(ownerId, scanId, sysViewDescription, tablePath, tableRange, columns);
+        return CreatePgClassScan(ownerId, scanId, database, sysViewDescription, tablePath, tableRange, columns);
     case ESysViewType::EResourcePoolClassifiers:
-        return CreateResourcePoolClassifiersScan(ownerId, scanId, sysViewDescription, tableRange, columns,
-                                                 std::move(userToken), database, reverse);
+        return CreateResourcePoolClassifiersScan(ownerId, scanId, database, sysViewDescription, tableRange, columns,
+                                                 std::move(userToken), reverse);
     case ESysViewType::EResourcePools:
-        return CreateResourcePoolsScan(ownerId, scanId, sysViewDescription, tableRange, columns, std::move(userToken), database, reverse);
+        return CreateResourcePoolsScan(ownerId, scanId, database, sysViewDescription, tableRange, columns,
+                                       std::move(userToken), reverse);
     case ESysViewType::EAuthUsers:
-        return NAuth::CreateUsersScan(ownerId, scanId, sysViewDescription, tableRange, columns, std::move(userToken));
+        return NAuth::CreateUsersScan(ownerId, scanId, database, sysViewDescription, tableRange, columns, std::move(userToken));
     case ESysViewType::EAuthGroups:
-        return NAuth::CreateGroupsScan(ownerId, scanId, sysViewDescription, tableRange, columns, std::move(userToken));
+        return NAuth::CreateGroupsScan(ownerId, scanId, database, sysViewDescription, tableRange, columns, std::move(userToken));
     case ESysViewType::EAuthGroupMembers:
-        return NAuth::CreateGroupMembersScan(ownerId, scanId, sysViewDescription, tableRange, columns, std::move(userToken));
+        return NAuth::CreateGroupMembersScan(ownerId, scanId, database, sysViewDescription, tableRange, columns, std::move(userToken));
     case ESysViewType::EAuthOwners:
-        return NAuth::CreateOwnersScan(ownerId, scanId, sysViewDescription, tableRange, columns, std::move(userToken));
+        return NAuth::CreateOwnersScan(ownerId, scanId, database, sysViewDescription, tableRange, columns, std::move(userToken));
     case ESysViewType::EAuthPermissions:
     case ESysViewType::EAuthEffectivePermissions:
         return NAuth::CreatePermissionsScan(sysViewDescription.GetType() == ESysViewType::EAuthEffectivePermissions,
-                                            ownerId, scanId, sysViewDescription, tableRange, columns, std::move(userToken));
+                                            ownerId, scanId, database, sysViewDescription, tableRange, columns, std::move(userToken));
     case ESysViewType::EShowCreate:
-        return CreateShowCreate(ownerId, scanId, sysViewDescription, tableRange, columns, database, std::move(userToken));
+        return CreateShowCreate(ownerId, scanId, database, sysViewDescription, tableRange, columns, std::move(userToken));
     default:
         return {};
     }
diff --git a/ydb/core/sys_view/scan.h b/ydb/core/sys_view/scan.h
index 1c8793944b3e..c721aa794512 100644
--- a/ydb/core/sys_view/scan.h
+++ b/ydb/core/sys_view/scan.h
@@ -8,15 +8,17 @@
 namespace NKikimr {
 namespace NSysView {
 
-THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
-    const TString& tablePath, const TMaybe<NKikimrSysView::TSysViewDescription>& sysViewInfo, TVector<TSerializedTableRange> ranges,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns, TIntrusiveConstPtr<NACLib::TUserToken> userToken,
-    const TString& database, bool reverse);
+THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId,
+    const TString& database, const TMaybe<NKikimrSysView::TSysViewDescription>& sysViewInfo,
+    const TTableId& tableId, const TString& tablePath,
+    TVector<TSerializedTableRange> ranges, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    TIntrusiveConstPtr<NACLib::TUserToken> userToken, bool reverse);
 
-THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId, const TTableId& tableId,
-    const TString& tablePath, const TMaybe<NKikimrSysView::TSysViewDescription>& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns, TIntrusiveConstPtr<NACLib::TUserToken> userToken,
-    const TString& database, bool reverse);
+THolder<NActors::IActor> CreateSystemViewScan(const NActors::TActorId& ownerId, ui32 scanId,
+    const TString& database, const TMaybe<NKikimrSysView::TSysViewDescription>& sysViewInfo,
+    const TTableId& tableId, const TString& tablePath,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
+    TIntrusiveConstPtr<NACLib::TUserToken> userToken, bool reverse);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/service/db_counters.cpp b/ydb/core/sys_view/service/db_counters.cpp
index 93d39311f877..c2b1dd4cc247 100644
--- a/ydb/core/sys_view/service/db_counters.cpp
+++ b/ydb/core/sys_view/service/db_counters.cpp
@@ -32,8 +32,8 @@ class TDbWatcherActor
 
 private:
     void Handle(NSysView::TEvSysView::TEvWatchDatabase::TPtr& ev) {
-        auto database = ev->Get()->Database;
-        auto pathId = ev->Get()->PathId;
+        const auto& database = ev->Get()->Database;
+        const auto& pathId = ev->Get()->PathId;
 
         if (!database) {
             if (!pathId || PathIdToDatabase.FindPtr(pathId)) {
@@ -52,6 +52,7 @@ class TDbWatcherActor
         DatabaseToPathId.emplace(database, TPathId());
 
         auto request = MakeHolder<TNavigate>();
+        request->DatabaseName = database;
         request->ResultSet.push_back({});
 
         auto& entry = request->ResultSet.back();
diff --git a/ydb/core/sys_view/service/sysview_service.cpp b/ydb/core/sys_view/service/sysview_service.cpp
index dd9249b8c8bf..481502e10cb5 100644
--- a/ydb/core/sys_view/service/sysview_service.cpp
+++ b/ydb/core/sys_view/service/sysview_service.cpp
@@ -461,6 +461,7 @@ class TSysViewService : public TActorBootstrapped<TSysViewService> {
         using TNavigate = NSchemeCache::TSchemeCacheNavigate;
 
         auto request = MakeHolder<TNavigate>();
+        request->DatabaseName = database;
         request->ResultSet.push_back({});
 
         auto& entry = request->ResultSet.back();
diff --git a/ydb/core/sys_view/sessions/sessions.cpp b/ydb/core/sys_view/sessions/sessions.cpp
index 99ee4023fe38..29ca2d44e173 100644
--- a/ydb/core/sys_view/sessions/sessions.cpp
+++ b/ydb/core/sys_view/sessions/sessions.cpp
@@ -93,9 +93,9 @@ class TSessionsScan : public NKikimr::NSysView::TScanActorBase<TSessionsScan> {
     };
 
     TSessionsScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
     {
         const auto& cellsFrom = TableRange.From.GetCells();
         if (cellsFrom.size() == 1 && !cellsFrom[0].IsNull()) {
@@ -296,10 +296,10 @@ class TSessionsScan : public NKikimr::NSysView::TScanActorBase<TSessionsScan> {
 };
 
 THolder<NActors::IActor> CreateSessionsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
     const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TSessionsScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
+    return MakeHolder<TSessionsScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
 }
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/sessions/sessions.h b/ydb/core/sys_view/sessions/sessions.h
index 9c6d91716de8..7abff4562d0d 100644
--- a/ydb/core/sys_view/sessions/sessions.h
+++ b/ydb/core/sys_view/sessions/sessions.h
@@ -10,8 +10,8 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreateSessionsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/show_create/show_create.cpp b/ydb/core/sys_view/show_create/show_create.cpp
index d1a70f25a306..b0a7d4be0668 100644
--- a/ydb/core/sys_view/show_create/show_create.cpp
+++ b/ydb/core/sys_view/show_create/show_create.cpp
@@ -59,11 +59,10 @@ class TShowCreate : public TScanActorBase<TShowCreate> {
     }
 
     TShowCreate(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
-        const TString& database, TIntrusiveConstPtr<NACLib::TUserToken> userToken)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
-        , Database(database)
+        TIntrusiveConstPtr<NACLib::TUserToken> userToken)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
         , UserToken(std::move(userToken))
     {
     }
@@ -147,7 +146,7 @@ class TShowCreate : public TScanActorBase<TShowCreate> {
         }
 
         std::unique_ptr<TEvTxUserProxy::TEvNavigate> navigateRequest(new TEvTxUserProxy::TEvNavigate());
-        navigateRequest->Record.SetDatabaseName(Database);
+        navigateRequest->Record.SetDatabaseName(DatabaseName);
         if (UserToken) {
             navigateRequest->Record.SetUserToken(UserToken->GetSerializedToken());
         }
@@ -188,7 +187,7 @@ class TShowCreate : public TScanActorBase<TShowCreate> {
 
         for (const auto& cdcStream: tableDesc.GetCdcStreams()) {
             std::unique_ptr<TEvTxUserProxy::TEvNavigate> navigateRequest(new TEvTxUserProxy::TEvNavigate());
-            navigateRequest->Record.SetDatabaseName(Database);
+            navigateRequest->Record.SetDatabaseName(DatabaseName);
             if (UserToken) {
                 navigateRequest->Record.SetUserToken(UserToken->GetSerializedToken());
             }
@@ -213,7 +212,7 @@ class TShowCreate : public TScanActorBase<TShowCreate> {
             CollectTableSettingsState->Sequences[sequencePathId] = nullptr;
 
             Send(NSequenceProxy::MakeSequenceProxyServiceID(),
-                new NSequenceProxy::TEvSequenceProxy::TEvGetSequence(Database, sequencePathId)
+                new NSequenceProxy::TEvSequenceProxy::TEvGetSequence(DatabaseName, sequencePathId)
             );
         }
     }
@@ -263,7 +262,7 @@ class TShowCreate : public TScanActorBase<TShowCreate> {
                 std::pair<TString, TString> pathPair;
                 {
                     TString error;
-                    if (!TrySplitPathByDb(Path, Database, pathPair, error)) {
+                    if (!TrySplitPathByDb(Path, DatabaseName, pathPair, error)) {
                         ReplyErrorAndDie(Ydb::StatusIds::SCHEME_ERROR, error);
                         return;
                     }
@@ -275,9 +274,9 @@ class TShowCreate : public TScanActorBase<TShowCreate> {
                         auto tablePath = pathPair.second;
 
                         bool temporary = false;
-                        if (NKqp::IsSessionsDirPath(Database, pathPair.second)) {
+                        if (NKqp::IsSessionsDirPath(DatabaseName, pathPair.second)) {
                             TString error;
-                            if (!RewriteTemporaryTablePath(Database, tablePath, error)) {
+                            if (!RewriteTemporaryTablePath(DatabaseName, tablePath, error)) {
                                 return ReplyErrorAndDie(Ydb::StatusIds::SCHEME_ERROR, error);
                             }
                             temporary = true;
@@ -305,9 +304,9 @@ class TShowCreate : public TScanActorBase<TShowCreate> {
                         auto tablePath = pathPair.second;
 
                         bool temporary = false;
-                        if (NKqp::IsSessionsDirPath(Database, pathPair.second)) {
+                        if (NKqp::IsSessionsDirPath(DatabaseName, pathPair.second)) {
                             TString error;
-                            if (!RewriteTemporaryTablePath(Database, tablePath, error)) {
+                            if (!RewriteTemporaryTablePath(DatabaseName, tablePath, error)) {
                                 return ReplyErrorAndDie(Ydb::StatusIds::SCHEME_ERROR, error);
                             }
                             temporary = true;
@@ -388,7 +387,7 @@ class TShowCreate : public TScanActorBase<TShowCreate> {
                 std::pair<TString, TString> pathPair;
                 {
                     TString error;
-                    if (!TrySplitPathByDb(currentPath, Database, pathPair, error)) {
+                    if (!TrySplitPathByDb(currentPath, DatabaseName, pathPair, error)) {
                         ReplyErrorAndDie(Ydb::StatusIds::SCHEME_ERROR, error);
                         return;
                     }
@@ -515,7 +514,6 @@ class TShowCreate : public TScanActorBase<TShowCreate> {
     }
 
 private:
-    TString Database;
     TIntrusiveConstPtr<NACLib::TUserToken> UserToken;
     TString Path;
     TString PathType;
@@ -539,11 +537,11 @@ class TShowCreate : public TScanActorBase<TShowCreate> {
 }
 
 THolder<NActors::IActor> CreateShowCreate(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns, const TString& database,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken)
 {
-    return MakeHolder<TShowCreate>(ownerId, scanId, sysViewInfo, tableRange, columns, database,
+    return MakeHolder<TShowCreate>(ownerId, scanId, database, sysViewInfo, tableRange, columns,
         std::move(userToken));
 }
 
diff --git a/ydb/core/sys_view/show_create/show_create.h b/ydb/core/sys_view/show_create/show_create.h
index 96b7296a7f1d..b9d8758a15a2 100644
--- a/ydb/core/sys_view/show_create/show_create.h
+++ b/ydb/core/sys_view/show_create/show_create.h
@@ -10,8 +10,8 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreateShowCreate(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns, const TString& database,
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns,
     TIntrusiveConstPtr<NACLib::TUserToken> userToken);
 
 } // NSysView
diff --git a/ydb/core/sys_view/storage/groups.cpp b/ydb/core/sys_view/storage/groups.cpp
index 01ae58f3b167..dfeb98c44c6e 100644
--- a/ydb/core/sys_view/storage/groups.cpp
+++ b/ydb/core/sys_view/storage/groups.cpp
@@ -56,10 +56,10 @@ class TGroupsScan : public TStorageScanBase<TGroupsScan, TEvSysView::TEvGetGroup
 
 };
 THolder<NActors::IActor> CreateGroupsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TGroupsScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
+    return MakeHolder<TGroupsScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
 }
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/storage/groups.h b/ydb/core/sys_view/storage/groups.h
index 109527373601..d5b1f46f4645 100644
--- a/ydb/core/sys_view/storage/groups.h
+++ b/ydb/core/sys_view/storage/groups.h
@@ -10,8 +10,8 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreateGroupsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/storage/pdisks.cpp b/ydb/core/sys_view/storage/pdisks.cpp
index 6f964f2211ad..51df80cfbed5 100644
--- a/ydb/core/sys_view/storage/pdisks.cpp
+++ b/ydb/core/sys_view/storage/pdisks.cpp
@@ -49,10 +49,10 @@ class TPDisksScan : public TStorageScanBase<TPDisksScan, TEvSysView::TEvGetPDisk
 };
 
 THolder<NActors::IActor> CreatePDisksScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TPDisksScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
+    return MakeHolder<TPDisksScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
 }
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/storage/pdisks.h b/ydb/core/sys_view/storage/pdisks.h
index b8eedd8f6cab..4bee60491d1b 100644
--- a/ydb/core/sys_view/storage/pdisks.h
+++ b/ydb/core/sys_view/storage/pdisks.h
@@ -10,8 +10,8 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreatePDisksScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/storage/storage_pools.cpp b/ydb/core/sys_view/storage/storage_pools.cpp
index f3eaf59b2f11..ac15407bde2c 100644
--- a/ydb/core/sys_view/storage/storage_pools.cpp
+++ b/ydb/core/sys_view/storage/storage_pools.cpp
@@ -42,10 +42,10 @@ class TStoragePoolsScan : public TStorageScanBase<TStoragePoolsScan, TEvSysView:
 };
 
 THolder<NActors::IActor> CreateStoragePoolsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TStoragePoolsScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
+    return MakeHolder<TStoragePoolsScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
 }
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/storage/storage_pools.h b/ydb/core/sys_view/storage/storage_pools.h
index a96a51c1770d..b96eb75cece2 100644
--- a/ydb/core/sys_view/storage/storage_pools.h
+++ b/ydb/core/sys_view/storage/storage_pools.h
@@ -10,8 +10,8 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreateStoragePoolsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/storage/storage_stats.cpp b/ydb/core/sys_view/storage/storage_stats.cpp
index d490e8094817..046cbba14640 100644
--- a/ydb/core/sys_view/storage/storage_stats.cpp
+++ b/ydb/core/sys_view/storage/storage_stats.cpp
@@ -30,10 +30,10 @@ class TStorageStatsScan : public TStorageScanBase<TStorageStatsScan, TEvSysView:
 };
 
 THolder<NActors::IActor> CreateStorageStatsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TStorageStatsScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
+    return MakeHolder<TStorageStatsScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
 }
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/storage/storage_stats.h b/ydb/core/sys_view/storage/storage_stats.h
index 4063beaaa228..ff8c0d77789c 100644
--- a/ydb/core/sys_view/storage/storage_stats.h
+++ b/ydb/core/sys_view/storage/storage_stats.h
@@ -9,7 +9,7 @@
 namespace NKikimr::NSysView {
 
 THolder<NActors::IActor> CreateStorageStatsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/storage/vslots.cpp b/ydb/core/sys_view/storage/vslots.cpp
index 25ce711082ca..0c1cb9333d7e 100644
--- a/ydb/core/sys_view/storage/vslots.cpp
+++ b/ydb/core/sys_view/storage/vslots.cpp
@@ -46,10 +46,10 @@ class TVSlotsScan : public TStorageScanBase<TVSlotsScan, TEvSysView::TEvGetVSlot
 };
 
 THolder<NActors::IActor> CreateVSlotsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TVSlotsScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
+    return MakeHolder<TVSlotsScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
 }
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/storage/vslots.h b/ydb/core/sys_view/storage/vslots.h
index 0b81dcbbd2a9..4112ce16a48f 100644
--- a/ydb/core/sys_view/storage/vslots.h
+++ b/ydb/core/sys_view/storage/vslots.h
@@ -10,8 +10,8 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreateVSlotsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/core/sys_view/tablets/tablets.cpp b/ydb/core/sys_view/tablets/tablets.cpp
index a337d58b31cd..6cab2544d5e5 100644
--- a/ydb/core/sys_view/tablets/tablets.cpp
+++ b/ydb/core/sys_view/tablets/tablets.cpp
@@ -24,9 +24,9 @@ class TTabletsScan : public TScanActorBase<TTabletsScan> {
     }
 
     TTabletsScan(const NActors::TActorId& ownerId, ui32 scanId,
-        const NKikimrSysView::TSysViewDescription& sysViewInfo,
+        const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
         const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
-        : TBase(ownerId, scanId, sysViewInfo, tableRange, columns)
+        : TBase(ownerId, scanId, database, sysViewInfo, tableRange, columns)
     {
     }
 
@@ -354,10 +354,10 @@ class TTabletsScan : public TScanActorBase<TTabletsScan> {
 };
 
 THolder<NActors::IActor> CreateTabletsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns)
 {
-    return MakeHolder<TTabletsScan>(ownerId, scanId, sysViewInfo, tableRange, columns);
+    return MakeHolder<TTabletsScan>(ownerId, scanId, database, sysViewInfo, tableRange, columns);
 }
 
 } // NKikimr::NSysView
diff --git a/ydb/core/sys_view/tablets/tablets.h b/ydb/core/sys_view/tablets/tablets.h
index cc55da58f025..98cb6f53e906 100644
--- a/ydb/core/sys_view/tablets/tablets.h
+++ b/ydb/core/sys_view/tablets/tablets.h
@@ -9,8 +9,8 @@ namespace NKikimr {
 namespace NSysView {
 
 THolder<NActors::IActor> CreateTabletsScan(const NActors::TActorId& ownerId, ui32 scanId,
-    const NKikimrSysView::TSysViewDescription& sysViewInfo, const TTableRange& tableRange,
-    const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
+    const TString& database, const NKikimrSysView::TSysViewDescription& sysViewInfo,
+    const TTableRange& tableRange, const TArrayRef<NMiniKQL::TKqpComputeContextBase::TColumn>& columns);
 
 } // NSysView
 } // NKikimr
diff --git a/ydb/library/table_creator/table_creator.cpp b/ydb/library/table_creator/table_creator.cpp
index 35c9be8b5186..0470a27734e8 100644
--- a/ydb/library/table_creator/table_creator.cpp
+++ b/ydb/library/table_creator/table_creator.cpp
@@ -415,7 +415,7 @@ namespace NTableCreator {
 THolder<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigateRequest(const TVector<TVector<TString>>& pathsComponents, const TString& database, TIntrusiveConstPtr<NACLib::TUserToken> userToken) {
     auto request = MakeHolder<NSchemeCache::TSchemeCacheNavigate>();
     auto databasePath = SplitPath(database);
-    request->DatabaseName = CanonizePath(databasePath);
+    request->DatabaseName = database;
     if (userToken && !userToken->GetSerializedToken().empty()) {
         request->UserToken = userToken;
     }