remove macros clash with absl libraries

28 files changed, 155 insertions, 161 deletions

diff --git a/library/cpp/actors/core/log.cpp b/library/cpp/actors/core/log.cpp
index 5f63b5af58..d005be6535 100644
--- a/library/cpp/actors/core/log.cpp
+++ b/library/cpp/actors/core/log.cpp
@@ -77,7 +77,7 @@ namespace NActors {
             HTML(str) {
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Counters" << Endl;
                         }
                         DynamicCounters->OutputHtml(str);
@@ -142,7 +142,7 @@ namespace NActors {
             HTML(str) {
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Metrics" << Endl;
                         }
                         // TODO: Now, TMetricRegistry does not have the GetOutputHtml function
@@ -312,7 +312,7 @@ namespace NActors {
     void TLoggerActor::RenderComponentPriorities(IOutputStream& str) {
         using namespace NLog;
         HTML(str) {
-            H4() {
+            TAG(TH4) {
                 str << "Priority Settings for the Components";
             }
             TABLE_SORTABLE_CLASS("table") {
@@ -415,7 +415,7 @@ namespace NActors {
             HTML(str) {
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Current log settings for " << Settings->ComponentName(component) << Endl;
                         }
                         UL() {
@@ -437,7 +437,7 @@ namespace NActors {
 
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Change priority" << Endl;
                         }
                         UL() {
@@ -448,7 +448,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling priority" << Endl;
                         }
                         UL() {
@@ -459,7 +459,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling rate" << Endl;
                         }
                         str << "<form method=\"GET\">" << Endl;
@@ -467,7 +467,7 @@ namespace NActors {
                         str << "<input type=\"hidden\" name=\"c\" value=\"" << component << "\">" << Endl;
                         str << "<input class=\"btn btn-primary\" type=\"submit\" value=\"Change\"/>" << Endl;
                         str << "</form>" << Endl;
-                        H4() {
+                        TAG(TH4) {
                             str << "<a href='logger'>Cancel</a>" << Endl;
                         }
                     }
@@ -503,7 +503,7 @@ namespace NActors {
                         RenderComponentPriorities(str);
                     }
                     DIV_CLASS("col-md-6") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Change priority for all components";
                         }
                         TABLE_CLASS("table table-condensed") {
@@ -525,7 +525,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling priority for all components";
                         }
                         TABLE_CLASS("table table-condensed") {
@@ -547,7 +547,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling rate for all components";
                         }
                         str << "<form method=\"GET\">" << Endl;
@@ -555,7 +555,7 @@ namespace NActors {
                         str << "<input type=\"hidden\" name=\"c\" value=\"-1\">" << Endl;
                         str << "<input class=\"btn btn-primary\" type=\"submit\" value=\"Change\"/>" << Endl;
                         str << "</form>" << Endl;
-                        H4() {
+                        TAG(TH4) {
                             str << "Drop log entries in case of overflow: "
                                 << (Settings->AllowDrop ? "Enabled" : "Disabled");
                         }
diff --git a/library/cpp/monlib/dynamic_counters/page.cpp b/library/cpp/monlib/dynamic_counters/page.cpp
index f80cc5ea04..f2fdd61710 100644
--- a/library/cpp/monlib/dynamic_counters/page.cpp
+++ b/library/cpp/monlib/dynamic_counters/page.cpp
@@ -123,7 +123,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) {
             out << " for Solomon";
         }
 
-        H5() {
+        TAG(TH5) {
             out << "Counters subgroups";
         }
         UL() {
@@ -136,7 +136,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) {
             });
         }
 
-        H4() {
+        TAG(TH4) {
             out << "Counters as text";
         }
     }
diff --git a/library/cpp/monlib/service/pages/templates.h b/library/cpp/monlib/service/pages/templates.h
index 0249807d5f..ab1d91c54e 100644
--- a/library/cpp/monlib/service/pages/templates.h
+++ b/library/cpp/monlib/service/pages/templates.h
@@ -55,17 +55,11 @@
 #define PARA() TAG(TPara)
 #define PARA_CLASS(cls) TAG_CLASS(TPara, cls)
 
-#define H1() TAG(TH1)
 #define H1_CLASS(cls) TAG_CLASS(TH1, cls)
-#define H2() TAG(TH2)
 #define H2_CLASS(cls) TAG_CLASS(TH2, cls)
-#define H3() TAG(TH3)
 #define H3_CLASS(cls) TAG_CLASS(TH3, cls)
-#define H4() TAG(TH4)
 #define H4_CLASS(cls) TAG_CLASS(TH4, cls)
-#define H5() TAG(TH5)
 #define H5_CLASS(cls) TAG_CLASS(TH5, cls)
-#define H6() TAG(TH6)
 #define H6_CLASS(cls) TAG_CLASS(TH6, cls)
 
 #define SMALL() TAG(TSMALL)
diff --git a/ydb/core/base/statestorage_monitoring.cpp b/ydb/core/base/statestorage_monitoring.cpp
index 5bcc3ec67f..bce0345fa9 100644
--- a/ydb/core/base/statestorage_monitoring.cpp
+++ b/ydb/core/base/statestorage_monitoring.cpp
@@ -50,7 +50,7 @@ class TStateStorageMonitoringActor : public TActorBootstrapped<TStateStorageMoni
         TStringStream str;
 
         HTML(str) {
-            H3() { str << "State Storage";}
+            TAG(TH3) { str << "State Storage";}
             DIV_CLASS("container") {
                 DIV_CLASS("row") {str << "TabletID: " << TabletID;}
                 DIV_CLASS("row") {str << "Response: " << response;}
diff --git a/ydb/core/blobstorage/nodewarden/node_warden_mon.cpp b/ydb/core/blobstorage/nodewarden/node_warden_mon.cpp
index 8d29bae0dd..b9a83b8a9f 100644
--- a/ydb/core/blobstorage/nodewarden/node_warden_mon.cpp
+++ b/ydb/core/blobstorage/nodewarden/node_warden_mon.cpp
@@ -89,10 +89,10 @@ void TNodeWarden::RenderWholePage(IOutputStream& out) {
             </style>
             )__";
 
-        H2() { out << "NodeWarden on node " << LocalNodeId; }
+        TAG(TH2) { out << "NodeWarden on node " << LocalNodeId; }
         RenderLocalDrives(out);
 
-        H3() { out << "PDisks"; }
+        TAG(TH3) { out << "PDisks"; }
         TABLE_CLASS("table oddgray") {
             TABLEHEAD() {
                 TABLER() {
@@ -114,7 +114,7 @@ void TNodeWarden::RenderWholePage(IOutputStream& out) {
             }
         }
 
-        H3() { out << "VDisks"; }
+        TAG(TH3) { out << "VDisks"; }
         TABLE_CLASS("table oddgray") {
             TABLEHEAD() {
                 TABLER() {
@@ -223,10 +223,10 @@ void TNodeWarden::RenderDSProxies(IOutputStream& out) {
             numStarted += bool(group.ProxyId);
         }
 
-        H3() { out << "Started DSProxies"; }
+        TAG(TH3) { out << "Started DSProxies"; }
         createTable(out, "started", numStarted);
 
-        H3() { out << "Ejected DSProxies"; }
+        TAG(TH3) { out << "Ejected DSProxies"; }
         createTable(out, "ejected", numEjected);
     }
 }
@@ -235,7 +235,7 @@ void TNodeWarden::RenderLocalDrives(IOutputStream& out) {
     TVector<NPDisk::TDriveData> onlineLocalDrives = ListLocalDrives();
 
     HTML(out) {
-        H3() { out << "LocalDrives"; }
+        TAG(TH3) { out << "LocalDrives"; }
         out << "\n";
         TABLE_CLASS("table oddgray") {
             TABLEHEAD() {
diff --git a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_http.cpp b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_http.cpp
index 5930e2bffc..0df4d828ed 100644
--- a/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_http.cpp
+++ b/ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_http.cpp
@@ -11,7 +11,7 @@ void TPDisk::RenderState(IOutputStream &str, THttpInfo &httpInfo) {
 #define RED_TEXT(str, text) THtmlLightSignalRenderer(NKikimrWhiteboard::EFlag::Red, text).Output(str)
 #define YELLOW_TEXT(str, text) THtmlLightSignalRenderer(NKikimrWhiteboard::EFlag::Yellow, text).Output(str)
     HTML(str) {
-        H4() {str << "Current state";}
+        TAG(TH4) {str << "Current state";}
         TABLE_CLASS ("table") {
             TABLEHEAD() {
                 TABLER() {
@@ -78,7 +78,7 @@ void TPDisk::RenderState(IOutputStream &str, THttpInfo &httpInfo) {
                 }
             }
         }
-        H4() {str << "State description"; }
+        TAG(TH4) {str << "State description"; }
         if (Cfg->SectorMap) {
             PARA() {str << "Note - this is SectorMap device<br>"; }
         }
@@ -86,7 +86,7 @@ void TPDisk::RenderState(IOutputStream &str, THttpInfo &httpInfo) {
             PARA() {str << "Note - PDisk sector enctyption is disabled<br>"; }
         }
         PARA() {str << httpInfo.ErrorStr; }
-        H4() {str << "Uptime"; }
+        TAG(TH4) {str << "Uptime"; }
         PARA() {
             TDuration uptime = TInstant::Now() - CreationTime;
             if (uptime.Days() > 0) {
@@ -95,7 +95,7 @@ void TPDisk::RenderState(IOutputStream &str, THttpInfo &httpInfo) {
             str << Sprintf("%02lu:%02lu:%02lu", uptime.Hours() % 24, uptime.Minutes() % 60, uptime.Seconds() % 60);
         }
         // Restart button
-        H4() {str << "Restart"; }
+        TAG(TH4) {str << "Restart"; }
         DIV() {
             str << R"___(
                 <script>
@@ -141,29 +141,29 @@ void TPDisk::RenderState(IOutputStream &str, THttpInfo &httpInfo) {
             }
         }
         if (Cfg->SectorMap) {
-            H4() {str << "SectorMap"; }
+            TAG(TH4) {str << "SectorMap"; }
             PRE() {str << Cfg->SectorMap->ToString();}
         }
-        H4() {str << "Config"; }
+        TAG(TH4) {str << "Config"; }
         PRE() {str << Cfg->ToString(true);}
         if (Mon.PDiskBriefState->Val() != TPDiskMon::TPDisk::Booting) {
-            H4() {str << "Drive Data"; }
+            TAG(TH4) {str << "Drive Data"; }
             PRE() {str << DriveData.ToString(true);}
-            H4() {str << "Fair Scheduler"; }
+            TAG(TH4) {str << "Fair Scheduler"; }
             PRE() {str << httpInfo.FairSchedulerStr;}
-            H4() {str << "Format info"; }
+            TAG(TH4) {str << "Format info"; }
             PRE() {str << Format.ToString(true);}
-            H4() {str << "Drive model"; }
+            TAG(TH4) {str << "Drive model"; }
             PRE() {str << DriveModel.ToString(true);}
-            H4() {str << "Sys log record"; }
+            TAG(TH4) {str << "Sys log record"; }
             PRE() {str << SysLogRecord.ToString(true);}
-            H4() {str << "Logged NONCEs"; }
+            TAG(TH4) {str << "Logged NONCEs"; }
             PRE() {str << LoggedNonces.ToString(true);}
-            H4() {str << "Dynamic state"; }
+            TAG(TH4) {str << "Dynamic state"; }
             PRE() {str << DynamicStateToString(true);}
-            H4() {str << "Last Nonce Jump Log Page Header"; }
+            TAG(TH4) {str << "Last Nonce Jump Log Page Header"; }
             PRE() {str << LastNonceJumpLogPageHeader2.ToString(true);}
-            H4() {str << "VDisk statuses"; }
+            TAG(TH4) {str << "VDisk statuses"; }
             PRE() {
                 for (const TOwnerData& data : OwnerData) {
                     if (data.VDiskId != TVDiskID::InvalidId) {
diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_idx.cpp b/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_idx.cpp
index 131699c86f..e7063f4ebf 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_idx.cpp
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_idx.cpp
@@ -198,7 +198,7 @@ namespace NKikimr {
                 DIV_CLASS("panel-body") {
                     DIV_CLASS("row") {
                         DIV_CLASS("col-md-1") {
-                            H5() { str << "Fresh"; }
+                            TAG(TH5) { str << "Fresh"; }
                             const char *comp = Fresh.CompactionInProgress() ? "Compaction In Progress" : "No Compaction";
                             H6_CLASS ("text-info") {str << comp << " W:" << FreshCompWritesInFlight;}
                         }
@@ -206,7 +206,7 @@ namespace NKikimr {
                     }
                     DIV_CLASS("row") {
                         DIV_CLASS("col-md-1") {
-                            H5() { str << "Levels"; }
+                            TAG(TH5) { str << "Levels"; }
                             H6_CLASS ("text-info") {str << GetCompStateStr(HullCompReadsInFlight, HullCompWritesInFlight);}
                         }
                         DIV_CLASS("col-md-11") {CurSlice->OutputHtml(str);}
diff --git a/ydb/core/kesus/tablet/tablet_html.cpp b/ydb/core/kesus/tablet/tablet_html.cpp
index 20d269bf65..2e15d15a72 100644
--- a/ydb/core/kesus/tablet/tablet_html.cpp
+++ b/ydb/core/kesus/tablet/tablet_html.cpp
@@ -27,7 +27,7 @@ struct TKesusTablet::THtmlRenderer {
 
     void RenderError(IOutputStream& out, const TString& message) {
         HTML(out) {
-            H3() { out << "ERROR: " << message; }
+            TAG(TH3) { out << "ERROR: " << message; }
         }
     }
 
@@ -39,7 +39,7 @@ struct TKesusTablet::THtmlRenderer {
 
     void RenderProxyList(IOutputStream& out) {
         HTML(out) {
-            H3() { out << "Proxies"; }
+            TAG(TH3) { out << "Proxies"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -71,13 +71,13 @@ struct TKesusTablet::THtmlRenderer {
         }
 
         HTML(out) {
-            H2() { out << "Kesus proxy " << actorId; }
+            TAG(TH2) { out << "Kesus proxy " << actorId; }
 
             PRE() {
                 out << "Generation: " << proxy->Generation << "\n";
             }
 
-            H3() { out << "Attached sessions"; }
+            TAG(TH3) { out << "Attached sessions"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -113,7 +113,7 @@ struct TKesusTablet::THtmlRenderer {
 
     void RenderSessionList(IOutputStream& out) {
         HTML(out) {
-            H3() { out << "Sessions"; }
+            TAG(TH3) { out << "Sessions"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -154,7 +154,7 @@ struct TKesusTablet::THtmlRenderer {
         }
 
         HTML(out) {
-            H2() { out << "Kesus session " << sessionId; }
+            TAG(TH2) { out << "Kesus session " << sessionId; }
 
             PRE() {
                 out << "Description: " << session->Description.Quote() << "\n";
@@ -170,7 +170,7 @@ struct TKesusTablet::THtmlRenderer {
                 out << "Last attach seqno: " << session->LastOwnerSeqNo << "\n";
             }
 
-            H3() { out << "Owned semaphores"; }
+            TAG(TH3) { out << "Owned semaphores"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -194,7 +194,7 @@ struct TKesusTablet::THtmlRenderer {
                 }
             }
 
-            H3() { out << "Waiting semaphores"; }
+            TAG(TH3) { out << "Waiting semaphores"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -242,7 +242,7 @@ struct TKesusTablet::THtmlRenderer {
 
     void RenderSemaphoreList(IOutputStream& out) {
         HTML(out) {
-            H3() { out << "Semaphores"; }
+            TAG(TH3) { out << "Semaphores"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -280,7 +280,7 @@ struct TKesusTablet::THtmlRenderer {
         }
 
         HTML(out) {
-            H2() { out << "Kesus semaphore " << EscapeC(name); }
+            TAG(TH2) { out << "Kesus semaphore " << EscapeC(name); }
 
             PRE() {
                 out << "Data: " << semaphore->Data.Quote() << "\n";
@@ -289,7 +289,7 @@ struct TKesusTablet::THtmlRenderer {
                 out << "Ephemeral: " << (semaphore->Ephemeral ? "true" : "false") << "\n";
             }
 
-            H3() { out << "Owner sessions"; }
+            TAG(TH3) { out << "Owner sessions"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -310,7 +310,7 @@ struct TKesusTablet::THtmlRenderer {
                 }
             }
 
-            H3() { out << "Waiting sessions"; }
+            TAG(TH3) { out << "Waiting sessions"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -376,7 +376,7 @@ struct TKesusTablet::THtmlRenderer {
 
     void RenderQuoterResources(IOutputStream& out) {
         HTML(out) {
-            H3() { out << "Quoter resources"; }
+            TAG(TH3) { out << "Quoter resources"; }
 
             std::vector<const TQuoterResourceTree*> resources;
             resources.reserve(Self->QuoterResources.GetAllResources().size());
@@ -391,7 +391,7 @@ struct TKesusTablet::THtmlRenderer {
     void RenderQuoterResourceDetails(IOutputStream& out, const TString& path) {
         if (const TQuoterResourceTree* resource = Self->QuoterResources.FindPath(path)) {
             HTML(out) {
-                H2() { out << "Kesus quoter resource " << EscapeC(path); }
+                TAG(TH2) { out << "Kesus quoter resource " << EscapeC(path); }
 
                 PRE() {
                     if (resource->GetParent()) {
@@ -403,12 +403,12 @@ struct TKesusTablet::THtmlRenderer {
                     out << "Props:" << props << "\n";
                 }
 
-                H3() { out << "Children resources"; }
+                TAG(TH3) { out << "Children resources"; }
 
                 std::vector<const TQuoterResourceTree*> resources(resource->GetChildren().begin(), resource->GetChildren().end());
                 RenderQuoterResourceTable(out, resources);
 
-                H3() { out << "Sessions"; }
+                TAG(TH3) { out << "Sessions"; }
                 RenderQuoterResourceSessions(out, resource);
             }
         } else {
@@ -465,7 +465,7 @@ bool TKesusTablet::OnRenderAppHtmlPage(NMon::TEvRemoteHttpInfo::TPtr ev, const T
         } else if (params.Has("quoter_resource")) {
             renderer.RenderQuoterResourceDetails(out, params.Get("quoter_resource"));
         } else {
-            H2() { out << "Kesus " << EscapeC(KesusPath); }
+            TAG(TH2) { out << "Kesus " << EscapeC(KesusPath); }
             renderer.RenderProxyList(out);
             renderer.RenderSessionList(out);
             renderer.RenderSemaphoreList(out);
diff --git a/ydb/core/keyvalue/keyvalue_state.cpp b/ydb/core/keyvalue/keyvalue_state.cpp
index 3a5c540ade..a203995750 100644
--- a/ydb/core/keyvalue/keyvalue_state.cpp
+++ b/ydb/core/keyvalue/keyvalue_state.cpp
@@ -3262,7 +3262,7 @@ void TKeyValueState::VerifyEqualIndex(const TKeyValueState& state) const {
 
 void TKeyValueState::RenderHTMLPage(IOutputStream &out) const {
     HTML(out) {
-        H2() {out << "KeyValue Tablet";}
+        TAG(TH2) {out << "KeyValue Tablet";}
         UL_CLASS("nav nav-tabs") {
             LI_CLASS("active") {
                 out << "<a href=\"#database\" data-toggle=\"tab\">Database</a>";
diff --git a/ydb/core/kqp/runtime/kqp_spilling_file.cpp b/ydb/core/kqp/runtime/kqp_spilling_file.cpp
index 0dd0a4f7a3..b46d5e1d31 100644
--- a/ydb/core/kqp/runtime/kqp_spilling_file.cpp
+++ b/ydb/core/kqp/runtime/kqp_spilling_file.cpp
@@ -643,7 +643,7 @@ private:
         }
 
         HTML(s) {
-            H2() { s << "Configuration"; }
+            TAG(TH2) { s << "Configuration"; }
             PRE() {
                 s << "  - Root: " << Config.GetRoot() << Endl;
                 s << "  - MaxTotalSize: " << Config.GetMaxTotalSize() << Endl;
@@ -653,11 +653,11 @@ private:
                     << ", queue: " << Config.GetIoThreadPool().GetQueueSize() << Endl;
             }
 
-            H2() { s << "Active files"; }
+            TAG(TH2) { s << "Active files"; }
             PRE() { s << "Used space: " << TotalSize << Endl; }
 
             for (const auto& tx : byTx) {
-                H4() { s << "Transaction " << tx.first; }
+                TAG(TH2) { s << "Transaction " << tx.first; }
                 s << "Open files:" << Endl;
                 UL() {
                     for (const auto* fd : tx.second) {
@@ -690,7 +690,7 @@ private:
                 }
             }
 
-            H2() { s << "Last closed files"; }
+            TAG(TH2) { s << "Last closed files"; }
             UL() {
                 for (auto it = ClosedFiles.rbegin(); it != ClosedFiles.rend(); ++it) {
                     auto& fd = *it;
diff --git a/ydb/core/mind/bscontroller/monitoring.cpp b/ydb/core/mind/bscontroller/monitoring.cpp
index aae938c43e..8864a53dc4 100644
--- a/ydb/core/mind/bscontroller/monitoring.cpp
+++ b/ydb/core/mind/bscontroller/monitoring.cpp
@@ -107,7 +107,7 @@ public:
         Self->RenderHeader(out);
 
         HTML(out) {
-            H3() {
+            TAG(TH3) {
                 out << "Operation Log";
             }
             TABLE_CLASS("table") {
@@ -247,7 +247,7 @@ private:
         Self->RenderHeader(out);
 
         HTML(out) {
-            H3() {
+            TAG(TH3) {
                 out << "Operation Log ";
                 if (HasEntry) {
                     out << "(entry " << RowIndex << ")";
@@ -513,10 +513,10 @@ public:
         HTML(s) {
             ui64 offset = Offset;
 
-            H3() {
+            TAG(TH3) {
                 s << "Health events";
             }
-            H3() {
+            TAG(TH3) {
                 s << "Health-related operations since " << Since.ToRfc822StringLocal();
             }
             TABLE_CLASS("table") {
@@ -1167,7 +1167,7 @@ void TBlobStorageController::RenderInternalTables(IOutputStream& out, const TStr
 void TBlobStorageController::RenderGroupDetail(IOutputStream &out, TGroupId groupId) {
     RenderHeader(out);
     HTML(out) {
-        H3() {
+        TAG(TH3) {
             out << "VDisks for group " << groupId;
         }
 
@@ -1194,7 +1194,7 @@ void TBlobStorageController::RenderGroupDetail(IOutputStream &out, TGroupId grou
 void TBlobStorageController::RenderGroupsInStoragePool(IOutputStream &out, const TBoxStoragePoolId& id) {
     RenderHeader(out);
     HTML(out) {
-        H3() {
+        TAG(TH3) {
             TString name;
             if (const auto it = StoragePools.find(id); it != StoragePools.end()) {
                 name = it->second.Name;
diff --git a/ydb/core/mind/bscontroller/scrub.cpp b/ydb/core/mind/bscontroller/scrub.cpp
index e37513bd1a..4bf46624df 100644
--- a/ydb/core/mind/bscontroller/scrub.cpp
+++ b/ydb/core/mind/bscontroller/scrub.cpp
@@ -370,7 +370,7 @@ public:
 
     void Render(IOutputStream& str) {
         HTML(str) {
-            H3() {
+            TAG(TH3) {
                 str << "Scrub state"
                     << "<br/>"
                     << (Self->ScrubPeriodicity != TDuration::Zero() ? TString(TStringBuilder() << "every " <<
diff --git a/ydb/core/mind/bscontroller/self_heal.cpp b/ydb/core/mind/bscontroller/self_heal.cpp
index e2d6bd391a..4e7178363f 100644
--- a/ydb/core/mind/bscontroller/self_heal.cpp
+++ b/ydb/core/mind/bscontroller/self_heal.cpp
@@ -452,7 +452,7 @@ namespace NKikimr::NBsController {
             const TInstant now = TActivationContext::Now();
 
             HTML(out) {
-                H2() {
+                TAG(TH2) {
                     out << "BlobStorage Controller";
                 }
                 DIV_CLASS("panel panel-info") {
diff --git a/ydb/core/mon_alloc/monitor.cpp b/ydb/core/mon_alloc/monitor.cpp
index 78037477f3..4069bc5e9e 100644
--- a/ydb/core/mon_alloc/monitor.cpp
+++ b/ydb/core/mon_alloc/monitor.cpp
@@ -154,7 +154,7 @@ namespace NKikimr {
                 auto info = NAllocDbg::GetPerTagAllocInfo(true, maxTag, numSizes);
 
                 HTML(out) {
-                    H3() {
+                    TAG(TH3) {
                         out << "LFAlloc" << Endl;
                     }
                     out << "<hr>" << Endl;
@@ -247,7 +247,7 @@ namespace NKikimr {
                 }
 #else
                 HTML(out) {
-                    H3() {
+                    TAG(TH3) {
                         out << "LFAlloc" << Endl;
                     }
                     out << "<hr>" << Endl;
@@ -314,7 +314,7 @@ namespace NKikimr {
                 GetMemoryUsageForTags(tags.data(), tags.size(), usages.data());
 
                 HTML(out) {
-                    H3() {
+                    TAG(TH3) {
                         out << "YTAlloc" << Endl;
                     }
                     out << "<hr>" << Endl;
@@ -358,7 +358,7 @@ namespace NKikimr {
                 }
 #else
                 HTML(out) {
-                    H3() {
+                    TAG(TH3) {
                         out << "YTAlloc" << Endl;
                     }
                     out << "<hr>" << Endl;
diff --git a/ydb/core/mon_alloc/tcmalloc.cpp b/ydb/core/mon_alloc/tcmalloc.cpp
index 8c3dc6f357..8f52c56478 100644
--- a/ydb/core/mon_alloc/tcmalloc.cpp
+++ b/ydb/core/mon_alloc/tcmalloc.cpp
@@ -708,11 +708,11 @@ public:
         auto stats = tcmalloc::MallocExtension::GetStats();
 
         HTML(out) {
-            H3() {
+            TAG(TH3) {
                 out << "TCMalloc" << Endl;
             }
             out << "<hr>" << Endl;
-            H4() {
+            TAG(TH4) {
                 out << "Allocator properties" << Endl;
             }
             TABLE_CLASS("table") {
@@ -734,7 +734,7 @@ public:
                 }
             }
             out << "<hr>" << Endl;
-            H4() {
+            TAG(TH4) {
                 out << "<a href=\"https://github.com/google/tcmalloc/blob/master/docs/stats.md\">Internal stats</a>" << Endl;
             }
             PRE() {
diff --git a/ydb/core/persqueue/pq_impl.cpp b/ydb/core/persqueue/pq_impl.cpp
index 44e853fac1..58f5a77196 100644
--- a/ydb/core/persqueue/pq_impl.cpp
+++ b/ydb/core/persqueue/pq_impl.cpp
@@ -497,9 +497,9 @@ private:
         for (auto& r: Results) mx = Max<ui32>(mx, r.second.size());
 
         HTML(str) {
-            H2() {str << "PersQueue Tablet";}
-            H3() {str << "Topic: " << TopicName;}
-            H4() {str << "inflight: " << Inflight;}
+            TAG(TH2) {str << "PersQueue Tablet";}
+            TAG(TH3) {str << "Topic: " << TopicName;}
+            TAG(TH4) {str << "inflight: " << Inflight;}
             UL_CLASS("nav nav-tabs") {
                 LI_CLASS("active") {
                     str << "<a href=\"#main\" data-toggle=\"tab\">main</a>";
@@ -532,7 +532,7 @@ private:
                     str << s;
                 }
             }
-            H3() {str << "<a href=\"app?TabletID=" << TabletID << "&kv=1\">KV-tablet internals</a>";}
+            TAG(TH3) {str << "<a href=\"app?TabletID=" << TabletID << "&kv=1\">KV-tablet internals</a>";}
         }
         LOG_DEBUG_S(ctx, NKikimrServices::PERSQUEUE, "Answer TEvRemoteHttpInfoRes: to " << Sender << " self " << ctx.SelfID);
         ctx.Send(Sender, new NMon::TEvRemoteHttpInfoRes(str.Str()));
diff --git a/ydb/core/persqueue/read_balancer.cpp b/ydb/core/persqueue/read_balancer.cpp
index 9c7f1e5c88..21528ad6d6 100644
--- a/ydb/core/persqueue/read_balancer.cpp
+++ b/ydb/core/persqueue/read_balancer.cpp
@@ -183,17 +183,17 @@ bool TPersQueueReadBalancer::OnRenderAppHtmlPage(NMon::TEvRemoteHttpInfo::TPtr e
 TString TPersQueueReadBalancer::GenerateStat() {
     TStringStream str;
     HTML(str) {
-        H2() {str << "PersQueueReadBalancer Tablet";}
-        H3() {str << "Topic: " << Topic;}
-        H3() {str << "Generation: " << Generation;}
-        H3() {str << "Inited: " << Inited;}
-        H3() {str << "ActivePipes: " << PipesInfo.size();}
+        TAG(TH2) {str << "PersQueueReadBalancer Tablet";}
+        TAG(TH3) {str << "Topic: " << Topic;}
+        TAG(TH3) {str << "Generation: " << Generation;}
+        TAG(TH3) {str << "Inited: " << Inited;}
+        TAG(TH3) {str << "ActivePipes: " << PipesInfo.size();}
         if (Inited) {
-            H3() {str << "Active partitions: " << NumActiveParts;}
-            H3() {str << "[Total/Max/Avg]WriteSpeedSec: " << TotalAvgSpeedSec << "/" << MaxAvgSpeedSec << "/" << TotalAvgSpeedSec / NumActiveParts;}
-            H3() {str << "[Total/Max/Avg]WriteSpeedMin: " << TotalAvgSpeedMin << "/" << MaxAvgSpeedMin << "/" << TotalAvgSpeedMin / NumActiveParts;}
-            H3() {str << "[Total/Max/Avg]WriteSpeedHour: " << TotalAvgSpeedHour << "/" << MaxAvgSpeedHour << "/" << TotalAvgSpeedHour / NumActiveParts;}
-            H3() {str << "[Total/Max/Avg]WriteSpeedDay: " << TotalAvgSpeedDay << "/" << MaxAvgSpeedDay << "/" << TotalAvgSpeedDay / NumActiveParts;}
+            TAG(TH3) {str << "Active partitions: " << NumActiveParts;}
+            TAG(TH3) {str << "[Total/Max/Avg]WriteSpeedSec: " << TotalAvgSpeedSec << "/" << MaxAvgSpeedSec << "/" << TotalAvgSpeedSec / NumActiveParts;}
+            TAG(TH3) {str << "[Total/Max/Avg]WriteSpeedMin: " << TotalAvgSpeedMin << "/" << MaxAvgSpeedMin << "/" << TotalAvgSpeedMin / NumActiveParts;}
+            TAG(TH3) {str << "[Total/Max/Avg]WriteSpeedHour: " << TotalAvgSpeedHour << "/" << MaxAvgSpeedHour << "/" << TotalAvgSpeedHour / NumActiveParts;}
+            TAG(TH3) {str << "[Total/Max/Avg]WriteSpeedDay: " << TotalAvgSpeedDay << "/" << MaxAvgSpeedDay << "/" << TotalAvgSpeedDay / NumActiveParts;}
         }
 
         UL_CLASS("nav nav-tabs") {
diff --git a/ydb/core/tablet/node_tablet_monitor.cpp b/ydb/core/tablet/node_tablet_monitor.cpp
index 8bb34e7ea0..15d147575c 100644
--- a/ydb/core/tablet/node_tablet_monitor.cpp
+++ b/ydb/core/tablet/node_tablet_monitor.cpp
@@ -55,7 +55,7 @@ public:
         Sort(NodesInfo->Nodes.begin(), NodesInfo->Nodes.end());
         TStringStream str;
         HTML(str) {
-            H3() {
+            TAG(TH3) {
                 str << "Nodes";
             }
             TABLE_SORTABLE_CLASS("table") {
@@ -82,7 +82,7 @@ public:
                 }
             }
             HTML_TAG() {str << "<a href=\"nodetabmon?action=browse_tablets\">All tablets of the cluster</a>";}
-            H3() {
+            TAG(TH3) {
                 str << "State Storages";
             }
             TABLE_SORTABLE_CLASS("table") {
@@ -339,7 +339,7 @@ public:
         }
         TStringStream str;
         HTML(str) {
-            H3() {
+            TAG(TH3) {
                 str << "Tablets of StateStorage " << StateStorageId;
             }
             TABLE_CLASS("table table-bordered") {
diff --git a/ydb/core/tablet/tablet_counters.cpp b/ydb/core/tablet/tablet_counters.cpp
index 1f21e710a0..c5ea6b7525 100644
--- a/ydb/core/tablet/tablet_counters.cpp
+++ b/ydb/core/tablet/tablet_counters.cpp
@@ -70,7 +70,7 @@ void TTabletSimpleCounterBase::OutputHtml(IOutputStream &os, const char* name) c
 void TTabletPercentileCounter::OutputHtml(IOutputStream &os, const char* name) const {
     HTML(os) {
         DIV_CLASS("row") {
-            DIV_CLASS("col-md-12") {H4() {os << name;}}
+            DIV_CLASS("col-md-12") {TAG(TH4) {os << name;}}
         }
 
         DIV_CLASS("row") {
@@ -101,7 +101,7 @@ template<typename T>
 void TTabletCountersBase::OutputHtml(IOutputStream &os, const char* sectionName, const char* const* counterNames, const char* counterClass, const TCountersArray<T>& counters) const {
     HTML(os) {
         DIV_CLASS("row") {
-            DIV_CLASS("col-md-12") {H3() {os << sectionName; }}
+            DIV_CLASS("col-md-12") {TAG(TH3) {os << sectionName; }}
         }
         DIV_CLASS("row") {
             for (ui32 i = 0, e = counters.Size(); i < e; ++i) {
@@ -181,7 +181,7 @@ TTabletLabeledCountersBase::operator = (const TTabletLabeledCountersBase& rp) {
 void TTabletLabeledCountersBase::OutputHtml(IOutputStream &os) const {
     HTML(os) {
         DIV_CLASS("row") {
-            DIV_CLASS("col-md-12") {H3() {os << Group; }}
+            DIV_CLASS("col-md-12") {TAG(TH3) {os << Group; }}
 
         }
         DIV_CLASS("row") {
diff --git a/ydb/core/tablet/tablet_list_renderer.cpp b/ydb/core/tablet/tablet_list_renderer.cpp
index 8c30effc8b..102d15d3d4 100644
--- a/ydb/core/tablet/tablet_list_renderer.cpp
+++ b/ydb/core/tablet/tablet_list_renderer.cpp
@@ -62,7 +62,7 @@ void TTabletListRenderer::RenderHeader(TStringStream& str,
 {
     Y_UNUSED(tabletsToRender);
     IOutputStream &__stream(str);
-    H3() {
+    TAG(TH3) {
         str << listName;
         if (filterInfo.FilterNodeId != 0) {
             str << " of Node " << filterInfo.FilterNodeId;
diff --git a/ydb/core/tablet/tablet_monitoring_proxy.cpp b/ydb/core/tablet/tablet_monitoring_proxy.cpp
index fd927d89f0..23791e4915 100644
--- a/ydb/core/tablet/tablet_monitoring_proxy.cpp
+++ b/ydb/core/tablet/tablet_monitoring_proxy.cpp
@@ -287,7 +287,7 @@ TTabletMonitoringProxyActor::Handle(NMon::TEvHttpInfo::TPtr &ev, const TActorCon
     HTML(str) {
         for (auto di: domains) {
             ui32 domainId = di.first;
-            H3() {
+            TAG(TH3) {
                 str << "Domain \"" << di.second->Name << "\" (id: " << domainId << ")";
             }
             TABLE_SORTABLE_CLASS("table") {
diff --git a/ydb/core/tablet_flat/flat_executor.cpp b/ydb/core/tablet_flat/flat_executor.cpp
index 035ccf44e7..38641a8c41 100644
--- a/ydb/core/tablet_flat/flat_executor.cpp
+++ b/ydb/core/tablet_flat/flat_executor.cpp
@@ -3866,12 +3866,12 @@ void TExecutor::RenderHtmlCounters(NMon::TEvRemoteHttpInfo::TPtr &ev) const {
             str << "table.metrics td:nth-child(3) { text-align: left; }";
             str << "</style>";
             if (Counters) {
-                H3() {str << "Executor counters";}
+                TAG(TH3) {str << "Executor counters";}
                 Counters->OutputHtml(str);
             }
 
             if (AppCounters) {
-                H3() {str << "App counters";}
+                TAG(TH3) {str << "App counters";}
                 AppCounters->OutputHtml(str);
             }
 
@@ -3927,7 +3927,7 @@ void TExecutor::RenderHtmlPage(NMon::TEvRemoteHttpInfo::TPtr &ev) const {
         }
     } else if (auto *scheme = Database ? &Database->GetScheme() : nullptr) {
         HTML(str) {
-            H3() { str << NFmt::Do(*this) << " tablet synopsis"; }
+            TAG(TH3) { str << NFmt::Do(*this) << " tablet synopsis"; }
 
             if (auto *logic = BootLogic.Get()) {
                  DIV_CLASS("row") {str << NFmt::Do(*logic); }
@@ -3949,14 +3949,14 @@ void TExecutor::RenderHtmlPage(NMon::TEvRemoteHttpInfo::TPtr &ev) const {
                 DIV_CLASS("row") { str << "Booted tablet without dbase"; }
             }
 
-            H3() {str << "Scheme:";}
+            TAG(TH3) {str << "Scheme:";}
             TVector<ui32> tables;
             for (const auto &xtable : scheme->Tables)
                 tables.push_back(xtable.first);
             Sort(tables);
             for (auto itable : tables) {
                 const auto &tinfo = scheme->Tables.find(itable)->second;
-                H4() {str << "<a href='db?TabletID=" << Owner->TabletID() << "&TableID=" << tinfo.Id << "'>Table: \"" << tinfo.Name << "\" id: " << tinfo.Id << "</a>";}
+                TAG(TH4) {str << "<a href='db?TabletID=" << Owner->TabletID() << "&TableID=" << tinfo.Id << "'>Table: \"" << tinfo.Name << "\" id: " << tinfo.Id << "</a>";}
                 TABLE_SORTABLE_CLASS("table") {
                     TABLEHEAD() {
                         TABLER() {
@@ -3985,18 +3985,18 @@ void TExecutor::RenderHtmlPage(NMon::TEvRemoteHttpInfo::TPtr &ev) const {
                 }
             }
 
-            H3() {str << "Storage:";}
+            TAG(TH3) {str << "Storage:";}
             DIV_CLASS("row") {str << "Bytes pinned in cache: " << PrivatePageCache->GetStats().PinnedSetSize << Endl; }
             DIV_CLASS("row") {str << "Bytes pinned to load: " << PrivatePageCache->GetStats().PinnedLoadSize << Endl; }
 
-            H3() {str << "Resource usage:";}
+            TAG(TH3) {str << "Resource usage:";}
             DIV_CLASS("row") {str << "used tablet memory: " << UsedTabletMemory; }
             Memory->DumpStateToHTML(str);
 
             if (CompactionLogic)
                 CompactionLogic->OutputHtml(str, *scheme, cgi);
 
-            H3() {str << "Page collection cache:";}
+            TAG(TH3) {str << "Page collection cache:";}
             DIV_CLASS("row") {str << "fresh bytes: " << CounterCacheFresh->Val(); }
             DIV_CLASS("row") {str << "staging bytes: " << CounterCacheStaging->Val(); }
             DIV_CLASS("row") {str << "warm bytes: " << CounterCacheWarm->Val(); }
@@ -4008,7 +4008,7 @@ void TExecutor::RenderHtmlPage(NMon::TEvRemoteHttpInfo::TPtr &ev) const {
             DIV_CLASS("row") {str << "Total bytes marked as sticky: " << PrivatePageCache->GetStats().TotalSticky; }
 
             if (GcLogic) {
-                H3() {str << "Gc logic:";}
+                TAG(TH3) {str << "Gc logic:";}
                 auto gcInfo = GcLogic->IntrospectStateSize();
                 DIV_CLASS("row") {str << "uncommited entries: " << gcInfo.UncommitedEntries;}
                 DIV_CLASS("row") {str << "uncommited blob ids: " << gcInfo.UncommitedBlobIds; }
@@ -4021,7 +4021,7 @@ void TExecutor::RenderHtmlPage(NMon::TEvRemoteHttpInfo::TPtr &ev) const {
             }
 
             if (BorrowLogic) {
-                H3() {str << "Borrow logic:";}
+                TAG(TH3) {str << "Borrow logic:";}
                 BorrowLogic->OutputHtml(str);
             }
         }
diff --git a/ydb/core/tablet_flat/flat_executor_borrowlogic.cpp b/ydb/core/tablet_flat/flat_executor_borrowlogic.cpp
index b0371b2701..733d862ad6 100644
--- a/ydb/core/tablet_flat/flat_executor_borrowlogic.cpp
+++ b/ydb/core/tablet_flat/flat_executor_borrowlogic.cpp
@@ -527,7 +527,7 @@ void TExecutorBorrowLogic::RestoreBorrowedInfo(const TLogoBlobID &blobId, const
 
 void TExecutorBorrowLogic::OutputHtml(IOutputStream &out) {
     HTML(out) {
-        H4() {out << "Borrowed parts";}
+        TAG(TH4) {out << "Borrowed parts";}
         PRE() {
             for (const auto &xpair : BorrowedInfo) {
                 if (xpair.second.BorrowInfo.FullBorrow) {
@@ -539,7 +539,7 @@ void TExecutorBorrowLogic::OutputHtml(IOutputStream &out) {
             }
         }
 
-        H4() {out << "Loaned parts";}
+        TAG(TH4) {out << "Loaned parts";}
         PRE() {
             for (const auto &xpair : BorrowedInfo) {
                 if (xpair.second.LoanInfo.Lender)
diff --git a/ydb/core/tablet_flat/flat_executor_compaction_logic.cpp b/ydb/core/tablet_flat/flat_executor_compaction_logic.cpp
index 514aea3725..7714664438 100644
--- a/ydb/core/tablet_flat/flat_executor_compaction_logic.cpp
+++ b/ydb/core/tablet_flat/flat_executor_compaction_logic.cpp
@@ -758,7 +758,7 @@ ui64 TCompactionLogic::GetBackingSize(ui64 ownerTabletId) const {
 void TCompactionLogic::OutputHtml(IOutputStream &out, const NTable::TScheme &scheme, const TCgiParameters& cgi) {
     HTML(out) {
         for (const auto &xtable : State->Tables) {
-            H4() {out << scheme.GetTableInfo(xtable.first)->Name;}
+            TAG(TH4) {out << scheme.GetTableInfo(xtable.first)->Name;}
 
             DIV_CLASS("row") { out
                 << "InMem Size: " << xtable.second.InMem.EstimatedSize
diff --git a/ydb/core/tracing/tablet_info.cpp b/ydb/core/tracing/tablet_info.cpp
index 6eb99ffc60..d332eb4258 100644
--- a/ydb/core/tracing/tablet_info.cpp
+++ b/ydb/core/tracing/tablet_info.cpp
@@ -195,7 +195,7 @@ public:
             AddTabletLookupForm(str);
             str << "<br>";
 
-            H3() {
+            TAG(TH3) {
                 str << "All tablets that have traces";
                 if (NodeId) {
                     str << " on Node " << NodeId << ":";
@@ -209,7 +209,7 @@ public:
                     auto& nodeTablets = nodeTabletsPair.second->Response.Get()->Record;
                     size_t tabletIDsSize = nodeTablets.TabletIDsSize();
                     if (!NodeId) {
-                        H4() {
+                        TAG(TH4) {
                             str << "Node " << nodeId;
                             if (!tabletIDsSize) {
                                 str << " - no tablets with traces found";
@@ -240,7 +240,7 @@ public:
                                 << "</font>";
                         }
                     } else {
-                        H4() {
+                        TAG(TH4) {
                             str << "<font color=\"red\">Node " << nodeId << ": "
                                 << TReplyStatus::StatusDescription(nodeTabletsPair.second->Status)
                                 << "</font>";
@@ -369,7 +369,7 @@ public:
         HTML(str) {
             NTracing::NHttp::OutputStaticPart(str);
             str << "<br>";
-            H3() {
+            TAG(TH3) {
                 str << "Traces for Tablet " << "<a href=\"tablet?iTabletID=" << TabletId << "\">"
                     << TabletId << "</a>" << ":";
             }
@@ -379,7 +379,7 @@ public:
                     auto& nodeTabletTraces = nodeTabletTracesPair.second->Response.Get()->Record;
                     size_t traceIDsSize = nodeTabletTraces.TraceIDsSize();
                     if (traceIDsSize) {
-                        H4() {
+                        TAG(TH4) {
                             str << "Node " << nodeId << ":";
                         }
                         // Sorting traces by Id
@@ -412,7 +412,7 @@ public:
             size_t emptyNodes = nodesWithNoTraces.size();
             if (emptyNodes) {
                 str << "<br>";
-                H4() {
+                TAG(TH4) {
                     str << "No traces found on " << emptyNodes << " node" << (emptyNodes == 1 ? ":" : "s:");
                 }
                 DIV_CLASS("row") {
@@ -431,7 +431,7 @@ public:
                 size_t failedNodes = failNodesPair.second.size();
                 if (failedNodes) {
                     str << "<br>";
-                    H4() {
+                    TAG(TH4) {
                         str << "<font color=\"red\">"
                             << TReplyStatus::StatusDescription(failNodesPair.first)
                             << "</font> on " << failedNodes
@@ -515,7 +515,7 @@ public:
         try {
             HTML(str) {
                 NTracing::NHttp::OutputStaticPart(str);
-                H4() {
+                TAG(TH4) {
                     str << "Trace " << TraceInfo.TraceId << "<br>at Tablet "
                         << "<a href=\"tablet?iTabletID=" << TraceInfo.TabletId << "\">" << TraceInfo.TabletId << "</a>"
                         << " on Node " << TraceInfo.NodeId << ":";
@@ -633,7 +633,7 @@ void RenderTabletPage(NMon::TEvHttpInfo::TPtr ev, const TActorContext &ctx, ui64
     TStringStream str;
     HTML(str) {
         NTracing::NHttp::OutputStaticPart(str);
-        H3() {
+        TAG(TH3) {
             str << "TabletID: " << tabletId;
         }
         DIV_CLASS("row") {
diff --git a/ydb/core/tx/scheme_board/monitoring.cpp b/ydb/core/tx/scheme_board/monitoring.cpp
index deda604655..7173826b9e 100644
--- a/ydb/core/tx/scheme_board/monitoring.cpp
+++ b/ydb/core/tx/scheme_board/monitoring.cpp
@@ -297,7 +297,7 @@ class TMonitoring: public TActorBootstrapped<TMonitoring> {
     static void Header(IOutputStream& str, const T& title, const U& subTitile) {
         HTML(str) {
             DIV_CLASS("page-header") {
-                H3() {
+                TAG(TH3) {
                     str << title;
                     if (subTitile) {
                         SMALL() { str << " " << subTitile; }
diff --git a/ydb/core/tx/schemeshard/schemeshard__monitoring.cpp b/ydb/core/tx/schemeshard/schemeshard__monitoring.cpp
index a3acc0b271..6b0f1f7eb1 100644
--- a/ydb/core/tx/schemeshard/schemeshard__monitoring.cpp
+++ b/ydb/core/tx/schemeshard/schemeshard__monitoring.cpp
@@ -556,7 +556,7 @@ private:
 
     void OutputMainPage(TStringStream& str) const {
         HTML(str) {
-            H3() {str << "SchemeShard main page:";}
+            TAG(TH3) {str << "SchemeShard main page:";}
 
             {
                 str << "<legend>";
@@ -634,21 +634,21 @@ private:
 
             {
                 str << "<legend>";
-                H3() {str << "Transactions in flight:"; }
+                TAG(TH3) {str << "Transactions in flight:"; }
                 str << "</legend>";
                 TableTxInfly(str);
             }
 
             {
                 str << "<legend>";
-                H3() {str << "Active Build Indexes in flight:"; }
+                TAG(TH3) {str << "Active Build Indexes in flight:"; }
                 str << "</legend>";
                 BuildIndexesInfly(str, /*forActive=*/ true);
             }
 
             {
                 str << "<legend>";
-                H3() {str << "Finished Build Indexes:"; }
+                TAG(TH3) {str << "Finished Build Indexes:"; }
                 str << "</legend>";
                 BuildIndexesInfly(str, /*forActive=*/ false);
             }
@@ -695,7 +695,7 @@ private:
 
     void BuildIndexInfoPage(TIndexBuildId buildIndexId, TStringStream& str) const {
         HTML(str) {
-            H3() {str << "Build index id " << buildIndexId;}
+            TAG(TH3) {str << "Build index id " << buildIndexId;}
 
             if (!Self->IndexBuilds.contains(buildIndexId)) {
                 PRE() {
@@ -705,7 +705,7 @@ private:
             }
 
             const TIndexBuildInfo::TPtr& info = Self->IndexBuilds.at(buildIndexId);
-            H4() {str << "Fields";}
+            TAG(TH4) {str << "Fields";}
             PRE () {
                 str << "BuildInfoId:                   " << info->Id << Endl
                     << "Uid:                           " << info->Uid << Endl
@@ -769,7 +769,7 @@ private:
             }
 
             {
-                H3() {str << "Shards : " << info->Shards.size() << "\n";}
+                TAG(TH3) {str << "Shards : " << info->Shards.size() << "\n";}
                 TABLE_SORTABLE_CLASS("table") {
                     TABLEHEAD() {
                         TABLER() {
@@ -875,7 +875,7 @@ private:
 
     void OutputTxListPage(TStringStream& str) const {
         HTML(str) {
-            H3() {str << "Transactions in flight:";}
+            TAG(TH3) {str << "Transactions in flight:";}
 
             TableTxInfly(str);
         }
@@ -883,7 +883,7 @@ private:
 
     void OutputTxInfoPage(TOperationId operationId, TStringStream& str) const {
         HTML(str) {
-            H3() {str << "Transaction " << operationId;}
+            TAG(TH3) {str << "Transaction " << operationId;}
 
             auto txInfo = Self->FindTx(operationId);
             if (!txInfo) {
@@ -892,7 +892,7 @@ private:
                 }
             } else {
                 const TTxState txState = *txInfo;
-                H3() {str << "Shards in progress : " << txState.ShardsInProgress.size() << "\n";}
+                TAG(TH3) {str << "Shards in progress : " << txState.ShardsInProgress.size() << "\n";}
                 TABLE_SORTABLE_CLASS("table") {
                     TABLEHEAD() {
                         TABLER() {
@@ -931,7 +931,7 @@ private:
     void OutputShardInfo(TShardIdx shardIdx, TStringStream& str) const {
         HTML(str) {
             if (!Self->ShardInfos.contains(shardIdx)) {
-                H4() {
+                TAG(TH4) {
                     str << "No shard item for shard " << shardIdx << "</a>";
                 }
                 return;
@@ -939,7 +939,7 @@ private:
 
             const TShardInfo& shard = Self->ShardInfos.at(shardIdx);
 
-            H4() {str << "Shard idx " << shardIdx << "</a>";}
+            TAG(TH4) {str << "Shard idx " << shardIdx << "</a>";}
             PRE () {
                 str << "TabletID:                     " << shard.TabletID<< Endl
                     << "CurrentTxId:                  " << shard.CurrentTxId << Endl
@@ -947,7 +947,7 @@ private:
                     << "TabletType:                   " << TTabletTypes::TypeToStr(shard.TabletType) << Endl;
             }
 
-            H4() {str << "BindedChannels for shard idx " << shardIdx << "</a>";}
+            TAG(TH4) {str << "BindedChannels for shard idx " << shardIdx << "</a>";}
             TABLE_SORTABLE_CLASS("BindedChannels") {
                 TABLEHEAD() {
                     TABLER() {
@@ -1001,7 +1001,7 @@ private:
     void OutputPathInfo(TPathId pathId, TStringStream& str) const {
         HTML(str) {
             if (!Self->PathsById.contains(pathId)) {
-                H4() {
+                TAG(TH4) {
                     str << "No path item for shard " << pathId << "</a>";
                 }
                 return;
@@ -1012,7 +1012,7 @@ private:
             auto localACL = TSecurityObject(path->Owner, path->ACL, path->IsContainer());
             auto effectiveACL = TSecurityObject(path->Owner, path->CachedEffectiveACL.GetForSelf(), path->IsContainer());
 
-            H4() {str << "Path info " << pathId << "</a>";}
+            TAG(TH4) {str << "Path info " << pathId << "</a>";}
             PRE () {
                 str << "Path:                     " << Self->PathToString(path) << Endl
                     << "PathId:                   " << pathId << Endl
@@ -1040,7 +1040,7 @@ private:
             }
 
             if (path->UserAttrs->Attrs) {
-                H4() {str << "UserAttrs for pathId " << pathId << "</a>";}
+                TAG(TH4) {str << "UserAttrs for pathId " << pathId << "</a>";}
                 TABLE_SORTABLE_CLASS("UserAttrs") {
                     TABLEHEAD() {
                         TABLER() {
@@ -1058,7 +1058,7 @@ private:
             }
 
             if (path->GetChildren().size()) {
-                H4() {str << "Childrens for pathId " << pathId << "</a>";}
+                TAG(TH4) {str << "Childrens for pathId " << pathId << "</a>";}
                 TABLE_SORTABLE_CLASS("UserAttrs") {
                     TABLEHEAD() {
                         TABLER() {
@@ -1085,7 +1085,7 @@ private:
 
             auto shards = Self->CollectAllShards({pathId});
 
-            H4() {str << "Shards for pathId " << pathId << "</a>";}
+            TAG(TH4) {str << "Shards for pathId " << pathId << "</a>";}
             TABLE_SORTABLE_CLASS("ShardForPath") {
                 TABLEHEAD() {
                     TABLER() {
@@ -1123,7 +1123,7 @@ private:
     void OutputOperationPartInfo(TOperationId opId, TStringStream& str) const {
         HTML(str) {
             if (!Self->Operations.contains(opId.GetTxId())) {
-                H4() {
+                TAG(TH4) {
                     str << "No operations for tx id " << opId << "</a>";
                 }
                 return;
@@ -1132,14 +1132,14 @@ private:
             TOperation::TPtr operation = Self->Operations.at(opId.GetTxId());
 
             if (ui64(opId.GetSubTxId()) >= operation->Parts.size()) {
-                H4() {
+                TAG(TH4) {
                     str << "No part operations for operation id " << opId << "</a>";
                 }
                 return;
             }
 
             if (!Self->TxInFlight.contains(opId)) {
-                H4() {
+                TAG(TH4) {
                     str << "No txInfly record for operation id " << opId << "</a>";
                 }
                 return;
@@ -1148,7 +1148,7 @@ private:
             const TTxState& txState = Self->TxInFlight.at(opId);
 
 
-            H4() {str << "TxState info " << opId << "</a>";}
+            TAG(TH4) {str << "TxState info " << opId << "</a>";}
             PRE () {
                 str << "TxType:                                  " << TTxState::TypeName(txState.TxType) << Endl
                     << "TargetPathId:                            " << LinkToPathInfo(txState.TargetPathId) << Endl
@@ -1168,7 +1168,7 @@ private:
                     << "Wait operations count:                   " << operation->WaitOperations.size() << Endl;
             }
 
-            H4() {str << "Dependent operations for txId " << opId.GetTxId() << "</a>";}
+            TAG(TH4) {str << "Dependent operations for txId " << opId.GetTxId() << "</a>";}
             TABLE_SORTABLE_CLASS("DependentTxId") {
                 TABLEHEAD() {
                     TABLER() {
@@ -1182,7 +1182,7 @@ private:
                 }
             }
 
-            H4() {str << "Wait operations for txId " << opId.GetTxId() << "</a>";}
+            TAG(TH4) {str << "Wait operations for txId " << opId.GetTxId() << "</a>";}
             TABLE_SORTABLE_CLASS("WaitTxId") {
                 TABLEHEAD() {
                     TABLER() {
@@ -1197,7 +1197,7 @@ private:
             }
 
 
-            H4() {str << "Shards for opId " << opId << "</a>";}
+            TAG(TH4) {str << "Shards for opId " << opId << "</a>";}
             TABLE_SORTABLE_CLASS("Shards") {
                 TABLEHEAD() {
                     TABLER() {
@@ -1220,7 +1220,7 @@ private:
                 }
             }
 
-            H4() {str << "Shards in progress for opId " << opId << "</a>";}
+            TAG(TH4) {str << "Shards in progress for opId " << opId << "</a>";}
             TABLE_SORTABLE_CLASS("Shards") {
                 TABLEHEAD() {
                     TABLER() {
@@ -1237,7 +1237,7 @@ private:
                 }
             }
 
-            H4() {str << "SchemeChangeNotificationReceived for opId " << opId << "</a>";}
+            TAG(TH4) {str << "SchemeChangeNotificationReceived for opId " << opId << "</a>";}
             TABLE_SORTABLE_CLASS("SchemeChangeNotificationReceived") {
                 TABLEHEAD() {
                     TABLER() {
@@ -1254,7 +1254,7 @@ private:
                 }
             }
 
-            H4() {str << "ShardStatuses for opId " << opId << "</a>";}
+            TAG(TH4) {str << "ShardStatuses for opId " << opId << "</a>";}
             TABLE_SORTABLE_CLASS("ShardStatuses") {
                 TABLEHEAD() {
                     TABLER() {
@@ -1284,7 +1284,7 @@ private:
     void OutputOperationInfo(TTxId txId, TStringStream& str) const {
         HTML(str) {
             if (!Self->Operations.contains(txId)) {
-                H4() {
+                TAG(TH4) {
                     str << "No operations for tx id " << txId << "</a>";
                 }
                 return;
@@ -1300,7 +1300,7 @@ private:
     void OutputPathInfoPage(TPathId pathId, TStringStream& str) {
         HTML(str) {
             if (!Self->PathsById.contains(pathId)) {
-                H4() {
+                TAG(TH4) {
                     str << "No path item for tablet " << pathId << "</a>";
                 }
                 return;
@@ -1320,7 +1320,7 @@ private:
     void OutputShardInfoPageByShardIdx(TShardIdx shardIdx, TStringStream& str) const {
         HTML(str) {
             if (!Self->ShardInfos.contains(shardIdx)) {
-                H4() {
+                TAG(TH4) {
                     str << "No shard info for shard idx " << shardIdx;
                 }
                 return;
@@ -1331,7 +1331,7 @@ private:
             const TShardInfo& shard = Self->ShardInfos[shardIdx];
 
             if (!Self->PathsById.contains(shard.PathId)) {
-                H4() {
+                TAG(TH4) {
                     str << "No path item path id " << shard.PathId;
                 }
                 return;
@@ -1348,7 +1348,7 @@ private:
     void OutputShardInfoPageByShardID(TTabletId tabletId, TStringStream& str) const {
         HTML(str) {
             if (!Self->TabletIdToShardIdx.contains(tabletId)) {
-                H4() {
+                TAG(TH4) {
                     str << "No shard info for shard ID "
                         << "<a href='../tablets?TabletID=" << tabletId << "'>" << tabletId << "</a>";
                 }
diff --git a/ydb/core/ymq/actor/garbage_collector.cpp b/ydb/core/ymq/actor/garbage_collector.cpp
index e82284c020..3da3ec7742 100644
--- a/ydb/core/ymq/actor/garbage_collector.cpp
+++ b/ydb/core/ymq/actor/garbage_collector.cpp
@@ -681,7 +681,7 @@ public:
 
         IOutputStream& __stream(str);
 
-        H4() {
+        TAG(TH4) {
             str << "Garbage hints";
         }
         TABLE_SORTABLE_CLASS("hints-table") {
@@ -713,7 +713,7 @@ public:
 
         IOutputStream& __stream(str);
 
-        H4() {
+        TAG(TH4) {
             str << "Cleaning history";
         }
         TABLE_SORTABLE_CLASS("cr-table") {