diff --git a/test/cmd/testdata/zz_fixture_TestGeneratedHTMLWithoutStepsUsesTimingFallbackcustom_link_tools_test_table.html b/test/cmd/testdata/zz_fixture_TestGeneratedHTMLWithoutStepsUsesTimingFallbackcustom_link_tools_test_table.html
index be02774f1b5..e7cd4a5b282 100644
--- a/test/cmd/testdata/zz_fixture_TestGeneratedHTMLWithoutStepsUsesTimingFallbackcustom_link_tools_test_table.html
+++ b/test/cmd/testdata/zz_fixture_TestGeneratedHTMLWithoutStepsUsesTimingFallbackcustom_link_tools_test_table.html
@@ -78,7 +78,7 @@
           
           <a target="_blank" href="https://dataexplorer.azure.com/clusters/hcp-dev-us-2.eastus2/databases/HostedControlPlaneLogs?query=H4sIAAAAAAAA%2F6SPMU%2FDMBBG9%2FyK2%2BJIJHJDoVWqsrAwMCDRiSW62qfW1LEj37UVUn88SkENdGDBkyXr%2BXvPk0DLgklWriNYgkUhcR2pWtd35aQuJ7OVvm3qaaPnlf46b8UiO4MU7F%2FYtJnoRs%2BuMeMsLEFZFFwjk8pfKR2coee44byoBNeeVG78noUS%2F3rMTnDcUiIYtliw62FNciQKoH5kVNXFbUQScdwnQ62zsEWGPG3K75EyYEflAb2zKC6Gctf73f08v7AsyVNQg3oBD6CzE1jH4oI55xSLbKx5iixkH2OQFP2Lx3AdFoOgC5T%2BnzRoc4%2BG2uE2VLUYPkANStkJ%2BhTfycj48w34uMk%2BAwAA%2F%2F9%2BUzye9AEAAA%3D%3D" title="Hosted Control Plane Logs">Hosted Control Plane Logs</a>
           
-          <a target="_blank" href="https://dataexplorer.azure.com/clusters/hcp-dev-us-2.eastus2/databases/ServiceLogs?query=H4sIAAAAAAAA%2F9xYXW%2FbNhe%2B9684ry5eS4vk2Fm3dh4ENHNXNECzBkmxAU09gyaPZS4SKZBUUvfjvw%2BkJEuynTbB3C2oLwLD5HlInud8PCcpGphpQ5R5zTOEGBgxaHiG%2FtHw6IdodBSNHr8efj8%2BejQePhkMy8%2Bb4OeeM0TBPmf2aDwajoeP22aHh%2FDrO6MINUDTQhtUoFDLQlGEk2ewUDKzf4RBwSCViXYHVVtn9dYZZxCD3wMAezKZE41%2B%2FwLVNaf4Uia6HwwMmafo92uw8ldn8RFulqgQ7H21IVkOczQ3iAL8lisGg%2FX7umbrSyRKFjnEMfRVElVXjATJMLomKWfEcCmiqzy9%2BvFJv4OQ6QSWREOfKiSGi2SNWe%2FDd84B3fdi6Tj%2FqbdlB%2F7lcfSGRO%2BH0U9vo7eDt4fTg8ALYRSCkdooLhI%2FlUlQv4RxbbigplltHVVvSnnGDYx6JW3HZyfwkqxQgXUlRPC8pokIBr8QemW%2F65ID3SsEl8IBlTTZz%2BFhY2S5HcPx%2BSt4MTlrKLenyByVc56GhVRgllw3D3VOXyPen%2Fx%2FEAD7CYISJVfyL7T%2Br68QApXCEC5Qzax5aKMktG5yVkG47cva511XzrtM7PRmdc%2B7urGC%2FAa82PsIUjFUMF%2B17k007fX%2Bg0o4qSrgKREkwQyFqXOrWtFQ8eFy7IXUBlltpA0xxa15tgVQBsmryem67mbNqfvLuApcdxa%2FSshwVtbQfz3tujRQKRh3rhtDl5rWEhAN2j5zvtpipg19sZQ3HbuUXyEcXxOeWveG8AwTRRiyEM6UTBRqzUUSwjlSKShPuXv3RUEpotuFhg6%2BEeqqllg1QWRx9W1G0tR%2F2v%2FgWQhv7LU64fQgiE5Ra5KgF3oLjin7naQFeuMPnlnldveF635e6JVt0Nn%2F6dnm%2BelTPwS2EiTj1L8chUfToNVMM1030%2FJ22XWE73KbpRkxdIm66dfIwEiw58mFXwEG2w8rg8YFIcStg0q4y%2BH0dpusfOMus9F0m4f2Sf%2BLwfNcddnAcgstU11kGVH8PQJRySzjwm%2Fl0HeBjewWbrgBd58UhBi8Ohajuov5JZ7VNFY9xaCNosT4nTO9MXibJwcumSGGOUlmOaFXvteyabZXCF3jbbSH2EY2BXWtoycXrupDYYsEUM7ApUBHUTthaaSmJCXqToL69jKxL119z%2FJQ23MtpMEsNysrdQe0EbLbandjQ1fpPudW1KYpnBLURsn2hLJDRFl3ZuXO9oCi7zqhrKN%2Ff6607tI5oVgmlPWmV13R604YqUwujGpXDjsmdMCqLRakiZrdc8pJZ0zp1z9zdhmPvemBf0mihZtQpgdB300nJXhwG5EN8BaXzVJF24lYKKKNKqgpFML%2F4ZWyJdCUyqZWVhWnIbxY5aj0ki9M6Orf8eQUjhMU5jZJVUdDqaTO65iYF4Kln5XZDp4bqwK0pJzYjlDfXrdPOBE0LRjqcRNx5aQnRQhFbkuCDoFhiu6gujgBXqMwOoTk%2FGwCVGZZITgtL3Pn5r8jCPfU9r8YjHcNyC8GJUjVWpgRsQJ%2FV2YG91aEEFfAX5CG65iqoqT1QxkgUoHqiDWQiw1FaaPlN8nwTMoUJuc7IwTMEmFyvonl%2FmHyMBlfrj2xZ9K%2FFpfrelBReUoEX6A2f0h1tcWhcISUExXbGq87qX1j7UnSHbtCa%2BvggeR5WmXvOsEXiMwO4Q%2BUW5mjWLfqZqyM3CsfIt236re%2FAwAA%2F%2F%2BU89j5DxUAAA%3D%3D" title="Service Logs">Service Logs</a>
+          <a target="_blank" href="https://dataexplorer.azure.com/clusters/hcp-dev-us-2.eastus2/databases/ServiceLogs?query=H4sIAAAAAAAA%2F%2BRYb2%2FbthN%2B709xP734WVokx866tfNgoJm7ogGaNUiKDWjqGTR1lllLpEBSSd0%2F330gKVmS%2F3QOlm5dlxeBIfGeI%2B8e3j2nFDVMlSZSv2QZwghiolGzDP2T%2Fsl30eAkGjx82f92ePJg2H%2FU67u%2FV8GPHWuIPP6U2YPhoD%2FsP2yaHR%2FDz2%2B1JFQDTQulUYJEJQpJEc6ewFyKzPzjGnkMqUiUdVQunVZLpyyGEfgdADCeyYwo9LtXKG8YxeciUd2gp8ksRb9bgbmn1uID3C5QIpj9Kk2yHGaobxE5%2BI1Q9Hrr87XN1ptIpChyGI2gK5Oo3GLESYbRDUlZTDQTPFrm6fL7R90WQqYSWBAFXSqRaMaTNWa1Dt%2FaALTPiy5w%2FmNvyw7869PoFYne9aMfXkeve6%2BPJ0eBF8IgBC2UlownfiqSoDpJzJRmnOr6bcNVtShlGdMw6Li0nV6cwXOyQgkmlBDB0ypNhMfwE6FL81u5HKhOwZngFsilyfwdH9dGJrdDOL18Ac%2FGF3XKjReRo7TBUzAXEvSCqfqgNuhrxLsn%2Fy8Q4H5I4FByKd6giX%2B1hRCo4JowjnJqzEPDktCEyVoF4XYsq5i3QzlrZ2JnNMt9HhrGEvIriGLnAwgZo4TZqrFvomin8w9UwnFZAc8JJwlmyHV1t8o3Csp82Dv2TCiNcWWkNNHF3nu2BeBI8mJ8vq67We31%2Fm5cCa5aLz8LZVjsaujffu3aaaCCx8yGbgjt1DReAVGgzDFnq63MNKGvFuK2ZZeyJcLpDWGpCW8ITzCRJMY4hAspEolKMZ6EcIlUcMpSZs99VVCKaFehpr2vJHVlSyybIMaj8teUpKn%2FuPveMxDe0Gt0wslREJ2jUiRBL%2FTmDNP4V5IW6A3fe3qVm9VXtvt5oefaoLX%2F3TPN8%2BPHbgjxipOMUf96EJ5MgkYzzVTVTN3uspsI3%2BbmlmZE0wWqul9jDFqA8SfmfgkYbB%2FMkcaSEEYNRw7uuj%2FZb5O5M%2B4yG0y289D09L8ReJ6tLhtY9kXDVBVZRiR7h0BkMs0Y9xt36JvAMLuBG27A3eUKwgi8iotR1cV8h2c0jVFPI1BaUqL9lk9vCN6m58BeZhjBjCTTnNCl7zVs6uUlQtt4G%2B1LbCObgrrS0eMrW%2FWhMEUCKIvBXoGWorbCUgtFSUrkQYJ6f5m4L119x%2FJQ2TPFhcYs1ysjdXu0FrLbandjQVvpPmVG1KYpnBNUWormhLJDRJlwZm5lc0BRh04oa%2FbfXyhNuFROKLoLZaLplVv09sWsZkTQHkJSkVxp2SwuZpJowZRLjJ8aZvcoc9aaZLrVYxZfj4be5Mi%2FJtHcDjGTo6BrBxgHHuzbdw28le76VZnZMz6XRGlZUF1IhP%2FDC2mqpHbipxJfZdpDeLbKUaoFm%2BvQlsjT8TmcJsj1PtVVEcaJrcuKNrOCx%2BknlbiFZ9oIBSUoI6ZpVLtXTQ9nnKZFjGpYk9INg4KHUOSmaqgQYkzROqrqF%2BANcq1CSC4vxkBFlhWcUbeZg%2FXBDp7ekzL4U74eyNlDeXsYd%2B8iGWFUAn1aO7YJ0iCE4LtSbwuO%2F0Yw7kQEuRGuOE4JX7mqFfxn03evheXA4tI6tdD%2BTvI0l5rcwZLxeMQ4Rwn%2Brk4RmPQ3itVnIl9dzkr%2BNR44KgoJsjVKgJhvzDumUP0iYrwQIoXx5c7iBHqBML7cxLKf875Mti7Wkfi66s26Y5UZPyeczVHp34RcbqWa27y5zwLx1jeiVvO5NfYkaX87CI2thQeS52nZX9YtaI4YzwhdfqEUEDnytd6sv41E9pT%2FYlbsnVX%2BCAAA%2F%2F%2Fz%2BS95%2BxcAAA%3D%3D" title="Service Logs">Service Logs</a>
           
           <a target="_blank" href="https://dataexplorer.azure.com/clusters/hcp-dev-us-2.eastus2/databases/ServiceLogs?query=H4sIAAAAAAAA%2F%2BxYbW8jtxH%2B7l8xEIquhK7W9jVtAhcGer02uEPq5OAzWqCXnECRo11GuyTD4Uqnoj%2B%2BGHJfLRtXFEXuQ%2BNPWpLzyplnHvryEu7fwtfemoBG3UCoNIG0jbMGTQBCf0AC2VKwDXrw%2BFOLFAgEgfP2o0YFO28beHl%2Fl8MRgSrb1goIcTwrbYOgDQijLi4vYYugNDkRZIUKgoVQIbSEHo46VLYNgN5bTwW8NLYRtW1p1GV9t8sKo7O1LUF4BAHbtkyryD7FgHI2qHe8xkc8grEgolqNBLyag6xQ7qPYVsg9GsU6CXbWw7E6gW0952gndJ38ldZ7lKE%2BcQoOmrQ1IEDWLQX0xYUSQWwF4TJ7h%2F6gJf7VlpStiiC2NS6z3rW0evEvOEbfgm6QgmgcbDEcEQ0slQjIy8sXVy9%2Bt75%2Bsb7%2B8uHqtzcvvri5%2Bqq4Sn%2F%2FWEFRwJMnv7i5vrq5%2BnI8ORrzSLb1Ejelt62D21vIfLnuIlgb0eD6IGqtRNDWrPeu3v%2F%2Bq2yQbqhMIulSwKNEfUCV8e2Mm%2BSsIYzFVGNAlnfe%2FogyjMHmfD7vr3fTYKisGr%2BdCNX49VOL%2FsSfSfOGgggtbaRVeHGRCvlP6QLP6hgNtR4pXnIXJmga7w8VVyf41hhtynj18WhX9wW8siZ4W9foiU2hkBWg2VkvEYjrm9otYQAbaw3YNeR%2BkLE0t1zVay5EYU6xDCtxYEOaqEXKWeYER13X4CwFaE0lnDtBipANsnddb225mQ5IQZcioCrgwSpxypMbnf0hsFk0KXDiyJU1CNvTsLamVKuspusZw5U%2BRN13Vt8iTwQx9tFjramhgo240LdjRiBMEo4RBhCgEB16qMUJ%2FSSXcv%2FJtur8%2Bpxd1RcWl%2F%2FYLZxDoQ36DfdV3BTerivp1p3P2f%2BoL2tbFtx%2BlSDIVNs4vpxe5Zs%2FZ7GIZocq6b5zaN5VehcmFc4q8SOD1KQCOvd5wwsZlovLZ6Qvl%2B8%2FfP%2F95Q%2B%2FWS1yuM4hWApem3LJpmXrPZpwP3gV89cc1vjRiWRPaY4ObqOrMoJlKJy3Dn3QSEVqimI4SRNgGRaLWlB48MJQ%2FHzQDQP9PJh8cjyc3Ow7GZmueBRkzXSlQSJRJux51Vd8V5xnCDR0JMHLf7aee3jnBQXfysCfMXiPInQo9frk0MfUwmtLAVVngY15lNarHJwgQgIdoCW%2B6zuBFLztZ2ojjCixYetdCeXRzFHokMbbRIBrcS0rYQzWHe4UMbDU1Kl1QyUmkQAFdARL1jSJaQXUSomoUCV7UWqKvFViD6VHojhS2VCmDQVR19qUWcLPAt7sOhs8fGEOY6AskskY2xW0jvFpqiIfQeYMjiILactiuDWg0Mr9YxUgI96iZk2RtrTImRiYRp8%2B0qVJMjk7OV5df1lG6lrHpi0uagywkbTpnNpoBbfcI1LUwi8vAAA%2BAXV9OLPNKPizwt7U4ABcWiVk%2BQ9gayqvydiAjQunpdSq1600BW2YL%2FQQMtmsdaMDXF%2Bs%2FvCp0fB0vj7PiODbvn10%2F1MAT9lL9CHYyKiGVWOPoM18bd6Mz3CsDvMjUI3FeQZRvjUE1jyDHamVW2%2B4o3rqx60%2F9BcsxRyr4NX9CrRJ%2Fc1ae341jI0eksHVwmABD1XHFXp2HzlfJBs80PrXRk9EBsCKq107MoVhksGvEUzUwpxCxXYT3z8i7DmXEZf6HtYEVGkXZ2ZK%2F687GIyWYvQ760OVnEx%2BUWWPNE6EIXuzLMQ3yLHSsuoZnNPGWW1Ct%2BqEj8SxT%2BOMvGma06wC3hgQqhuSEek1wUHjcUrAvmm36A0GTGz1gKZDfN58axWl4BuxR8bOM59%2Fgan%2Fa5j6b%2FI0fR1GmTth9A4p%2FN36fay9TsOEXTbdkc2Rz9xyJxBufiRrlh5dLSQ%2F8mJGh9Q2VK5yoOClCMvFczYgW%2BTz6s1hkd3AYpXDYvGIc%2FZewO3coZ5p9tl4lz77MzSG3K0MJ%2B8wiGKvTQT7bNZZ2bN0d9CSzH6NqBh5ioOoW6QZJU8yjxn5Hxcflu8%2FrM%2BJ90hZWSJGf6Zrp7FWM2Wdrl99Wtnw0Jnp0gaWi%2FvImhc5LFL2%2BNdd4s2L1dPTah5f%2FljvdCGmJuHSY%2Bfi2b%2FxfvE%2BS7vZDzFyFmJ8d%2Fpgw%2FJMuzCn5SMLq1Xi%2BN2sesuzCv4SQZWHKBL2EIsfnSWEY894nxij8fHNeH6sdD2OxGeBmS3PpmT%2FLn55%2Fx28fvV2%2FMfTL5D9c0P2fhizqRo%2BF17H6vtWNEhOSIx5OqOYT3Sa3fLKN9qo%2Fve3seP6p273wM1hpz2Fd4gmB35X869%2FBwAA%2F%2F9VHIv4ORYAAA%3D%3D" title="Debug Queries">Debug Queries</a>
           
diff --git a/test/cmd/testdata/zz_fixture_TestGeneratedHTMLcustom_link_tools_test_table.html b/test/cmd/testdata/zz_fixture_TestGeneratedHTMLcustom_link_tools_test_table.html
index be02774f1b5..e7cd4a5b282 100644
--- a/test/cmd/testdata/zz_fixture_TestGeneratedHTMLcustom_link_tools_test_table.html
+++ b/test/cmd/testdata/zz_fixture_TestGeneratedHTMLcustom_link_tools_test_table.html
@@ -78,7 +78,7 @@
           
           <a target="_blank" href="https://dataexplorer.azure.com/clusters/hcp-dev-us-2.eastus2/databases/HostedControlPlaneLogs?query=H4sIAAAAAAAA%2F6SPMU%2FDMBBG9%2FyK2%2BJIJHJDoVWqsrAwMCDRiSW62qfW1LEj37UVUn88SkENdGDBkyXr%2BXvPk0DLgklWriNYgkUhcR2pWtd35aQuJ7OVvm3qaaPnlf46b8UiO4MU7F%2FYtJnoRs%2BuMeMsLEFZFFwjk8pfKR2coee44byoBNeeVG78noUS%2F3rMTnDcUiIYtliw62FNciQKoH5kVNXFbUQScdwnQ62zsEWGPG3K75EyYEflAb2zKC6Gctf73f08v7AsyVNQg3oBD6CzE1jH4oI55xSLbKx5iixkH2OQFP2Lx3AdFoOgC5T%2BnzRoc4%2BG2uE2VLUYPkANStkJ%2BhTfycj48w34uMk%2BAwAA%2F%2F9%2BUzye9AEAAA%3D%3D" title="Hosted Control Plane Logs">Hosted Control Plane Logs</a>
           
-          <a target="_blank" href="https://dataexplorer.azure.com/clusters/hcp-dev-us-2.eastus2/databases/ServiceLogs?query=H4sIAAAAAAAA%2F9xYXW%2FbNhe%2B9684ry5eS4vk2Fm3dh4ENHNXNECzBkmxAU09gyaPZS4SKZBUUvfjvw%2BkJEuynTbB3C2oLwLD5HlInud8PCcpGphpQ5R5zTOEGBgxaHiG%2FtHw6IdodBSNHr8efj8%2BejQePhkMy8%2Bb4OeeM0TBPmf2aDwajoeP22aHh%2FDrO6MINUDTQhtUoFDLQlGEk2ewUDKzf4RBwSCViXYHVVtn9dYZZxCD3wMAezKZE41%2B%2FwLVNaf4Uia6HwwMmafo92uw8ldn8RFulqgQ7H21IVkOczQ3iAL8lisGg%2FX7umbrSyRKFjnEMfRVElVXjATJMLomKWfEcCmiqzy9%2BvFJv4OQ6QSWREOfKiSGi2SNWe%2FDd84B3fdi6Tj%2FqbdlB%2F7lcfSGRO%2BH0U9vo7eDt4fTg8ALYRSCkdooLhI%2FlUlQv4RxbbigplltHVVvSnnGDYx6JW3HZyfwkqxQgXUlRPC8pokIBr8QemW%2F65ID3SsEl8IBlTTZz%2BFhY2S5HcPx%2BSt4MTlrKLenyByVc56GhVRgllw3D3VOXyPen%2Fx%2FEAD7CYISJVfyL7T%2Br68QApXCEC5Qzax5aKMktG5yVkG47cva511XzrtM7PRmdc%2B7urGC%2FAa82PsIUjFUMF%2B17k007fX%2Bg0o4qSrgKREkwQyFqXOrWtFQ8eFy7IXUBlltpA0xxa15tgVQBsmryem67mbNqfvLuApcdxa%2FSshwVtbQfz3tujRQKRh3rhtDl5rWEhAN2j5zvtpipg19sZQ3HbuUXyEcXxOeWveG8AwTRRiyEM6UTBRqzUUSwjlSKShPuXv3RUEpotuFhg6%2BEeqqllg1QWRx9W1G0tR%2F2v%2FgWQhv7LU64fQgiE5Ra5KgF3oLjin7naQFeuMPnlnldveF635e6JVt0Nn%2F6dnm%2BelTPwS2EiTj1L8chUfToNVMM1030%2FJ22XWE73KbpRkxdIm66dfIwEiw58mFXwEG2w8rg8YFIcStg0q4y%2BH0dpusfOMus9F0m4f2Sf%2BLwfNcddnAcgstU11kGVH8PQJRySzjwm%2Fl0HeBjewWbrgBd58UhBi8Ohajuov5JZ7VNFY9xaCNosT4nTO9MXibJwcumSGGOUlmOaFXvteyabZXCF3jbbSH2EY2BXWtoycXrupDYYsEUM7ApUBHUTthaaSmJCXqToL69jKxL119z%2FJQ23MtpMEsNysrdQe0EbLbandjQ1fpPudW1KYpnBLURsn2hLJDRFl3ZuXO9oCi7zqhrKN%2Ff6607tI5oVgmlPWmV13R604YqUwujGpXDjsmdMCqLRakiZrdc8pJZ0zp1z9zdhmPvemBf0mihZtQpgdB300nJXhwG5EN8BaXzVJF24lYKKKNKqgpFML%2F4ZWyJdCUyqZWVhWnIbxY5aj0ki9M6Orf8eQUjhMU5jZJVUdDqaTO65iYF4Kln5XZDp4bqwK0pJzYjlDfXrdPOBE0LRjqcRNx5aQnRQhFbkuCDoFhiu6gujgBXqMwOoTk%2FGwCVGZZITgtL3Pn5r8jCPfU9r8YjHcNyC8GJUjVWpgRsQJ%2FV2YG91aEEFfAX5CG65iqoqT1QxkgUoHqiDWQiw1FaaPlN8nwTMoUJuc7IwTMEmFyvonl%2FmHyMBlfrj2xZ9K%2FFpfrelBReUoEX6A2f0h1tcWhcISUExXbGq87qX1j7UnSHbtCa%2BvggeR5WmXvOsEXiMwO4Q%2BUW5mjWLfqZqyM3CsfIt236re%2FAwAA%2F%2F%2BU89j5DxUAAA%3D%3D" title="Service Logs">Service Logs</a>
+          <a target="_blank" href="https://dataexplorer.azure.com/clusters/hcp-dev-us-2.eastus2/databases/ServiceLogs?query=H4sIAAAAAAAA%2F%2BRYb2%2FbthN%2B709xP734WVokx866tfNgoJm7ogGaNUiKDWjqGTR1lllLpEBSSd0%2F330gKVmS%2F3QOlm5dlxeBIfGeI%2B8e3j2nFDVMlSZSv2QZwghiolGzDP2T%2Fsl30eAkGjx82f92ePJg2H%2FU67u%2FV8GPHWuIPP6U2YPhoD%2FsP2yaHR%2FDz2%2B1JFQDTQulUYJEJQpJEc6ewFyKzPzjGnkMqUiUdVQunVZLpyyGEfgdADCeyYwo9LtXKG8YxeciUd2gp8ksRb9bgbmn1uID3C5QIpj9Kk2yHGaobxE5%2BI1Q9Hrr87XN1ptIpChyGI2gK5Oo3GLESYbRDUlZTDQTPFrm6fL7R90WQqYSWBAFXSqRaMaTNWa1Dt%2FaALTPiy5w%2FmNvyw7869PoFYne9aMfXkeve6%2BPJ0eBF8IgBC2UlownfiqSoDpJzJRmnOr6bcNVtShlGdMw6Li0nV6cwXOyQgkmlBDB0ypNhMfwE6FL81u5HKhOwZngFsilyfwdH9dGJrdDOL18Ac%2FGF3XKjReRo7TBUzAXEvSCqfqgNuhrxLsn%2Fy8Q4H5I4FByKd6giX%2B1hRCo4JowjnJqzEPDktCEyVoF4XYsq5i3QzlrZ2JnNMt9HhrGEvIriGLnAwgZo4TZqrFvomin8w9UwnFZAc8JJwlmyHV1t8o3Csp82Dv2TCiNcWWkNNHF3nu2BeBI8mJ8vq67We31%2Fm5cCa5aLz8LZVjsaujffu3aaaCCx8yGbgjt1DReAVGgzDFnq63MNKGvFuK2ZZeyJcLpDWGpCW8ITzCRJMY4hAspEolKMZ6EcIlUcMpSZs99VVCKaFehpr2vJHVlSyybIMaj8teUpKn%2FuPveMxDe0Gt0wslREJ2jUiRBL%2FTmDNP4V5IW6A3fe3qVm9VXtvt5oefaoLX%2F3TPN8%2BPHbgjxipOMUf96EJ5MgkYzzVTVTN3uspsI3%2BbmlmZE0wWqul9jDFqA8SfmfgkYbB%2FMkcaSEEYNRw7uuj%2FZb5O5M%2B4yG0y289D09L8ReJ6tLhtY9kXDVBVZRiR7h0BkMs0Y9xt36JvAMLuBG27A3eUKwgi8iotR1cV8h2c0jVFPI1BaUqL9lk9vCN6m58BeZhjBjCTTnNCl7zVs6uUlQtt4G%2B1LbCObgrrS0eMrW%2FWhMEUCKIvBXoGWorbCUgtFSUrkQYJ6f5m4L119x%2FJQ2TPFhcYs1ysjdXu0FrLbandjQVvpPmVG1KYpnBNUWormhLJDRJlwZm5lc0BRh04oa%2FbfXyhNuFROKLoLZaLplVv09sWsZkTQHkJSkVxp2SwuZpJowZRLjJ8aZvcoc9aaZLrVYxZfj4be5Mi%2FJtHcDjGTo6BrBxgHHuzbdw28le76VZnZMz6XRGlZUF1IhP%2FDC2mqpHbipxJfZdpDeLbKUaoFm%2BvQlsjT8TmcJsj1PtVVEcaJrcuKNrOCx%2BknlbiFZ9oIBSUoI6ZpVLtXTQ9nnKZFjGpYk9INg4KHUOSmaqgQYkzROqrqF%2BANcq1CSC4vxkBFlhWcUbeZg%2FXBDp7ekzL4U74eyNlDeXsYd%2B8iGWFUAn1aO7YJ0iCE4LtSbwuO%2F0Yw7kQEuRGuOE4JX7mqFfxn03evheXA4tI6tdD%2BTvI0l5rcwZLxeMQ4Rwn%2Brk4RmPQ3itVnIl9dzkr%2BNR44KgoJsjVKgJhvzDumUP0iYrwQIoXx5c7iBHqBML7cxLKf875Mti7Wkfi66s26Y5UZPyeczVHp34RcbqWa27y5zwLx1jeiVvO5NfYkaX87CI2thQeS52nZX9YtaI4YzwhdfqEUEDnytd6sv41E9pT%2FYlbsnVX%2BCAAA%2F%2F%2Fz%2BS95%2BxcAAA%3D%3D" title="Service Logs">Service Logs</a>
           
           <a target="_blank" href="https://dataexplorer.azure.com/clusters/hcp-dev-us-2.eastus2/databases/ServiceLogs?query=H4sIAAAAAAAA%2F%2BxYbW8jtxH%2B7l8xEIquhK7W9jVtAhcGer02uEPq5OAzWqCXnECRo11GuyTD4Uqnoj%2B%2BGHJfLRtXFEXuQ%2BNPWpLzyplnHvryEu7fwtfemoBG3UCoNIG0jbMGTQBCf0AC2VKwDXrw%2BFOLFAgEgfP2o0YFO28beHl%2Fl8MRgSrb1goIcTwrbYOgDQijLi4vYYugNDkRZIUKgoVQIbSEHo46VLYNgN5bTwW8NLYRtW1p1GV9t8sKo7O1LUF4BAHbtkyryD7FgHI2qHe8xkc8grEgolqNBLyag6xQ7qPYVsg9GsU6CXbWw7E6gW0952gndJ38ldZ7lKE%2BcQoOmrQ1IEDWLQX0xYUSQWwF4TJ7h%2F6gJf7VlpStiiC2NS6z3rW0evEvOEbfgm6QgmgcbDEcEQ0slQjIy8sXVy9%2Bt75%2Bsb7%2B8uHqtzcvvri5%2Bqq4Sn%2F%2FWEFRwJMnv7i5vrq5%2BnI8ORrzSLb1Ejelt62D21vIfLnuIlgb0eD6IGqtRNDWrPeu3v%2F%2Bq2yQbqhMIulSwKNEfUCV8e2Mm%2BSsIYzFVGNAlnfe%2FogyjMHmfD7vr3fTYKisGr%2BdCNX49VOL%2FsSfSfOGgggtbaRVeHGRCvlP6QLP6hgNtR4pXnIXJmga7w8VVyf41hhtynj18WhX9wW8siZ4W9foiU2hkBWg2VkvEYjrm9otYQAbaw3YNeR%2BkLE0t1zVay5EYU6xDCtxYEOaqEXKWeYER13X4CwFaE0lnDtBipANsnddb225mQ5IQZcioCrgwSpxypMbnf0hsFk0KXDiyJU1CNvTsLamVKuspusZw5U%2BRN13Vt8iTwQx9tFjramhgo240LdjRiBMEo4RBhCgEB16qMUJ%2FSSXcv%2FJtur8%2Bpxd1RcWl%2F%2FYLZxDoQ36DfdV3BTerivp1p3P2f%2BoL2tbFtx%2BlSDIVNs4vpxe5Zs%2FZ7GIZocq6b5zaN5VehcmFc4q8SOD1KQCOvd5wwsZlovLZ6Qvl%2B8%2FfP%2F95Q%2B%2FWS1yuM4hWApem3LJpmXrPZpwP3gV89cc1vjRiWRPaY4ObqOrMoJlKJy3Dn3QSEVqimI4SRNgGRaLWlB48MJQ%2FHzQDQP9PJh8cjyc3Ow7GZmueBRkzXSlQSJRJux51Vd8V5xnCDR0JMHLf7aee3jnBQXfysCfMXiPInQo9frk0MfUwmtLAVVngY15lNarHJwgQgIdoCW%2B6zuBFLztZ2ojjCixYetdCeXRzFHokMbbRIBrcS0rYQzWHe4UMbDU1Kl1QyUmkQAFdARL1jSJaQXUSomoUCV7UWqKvFViD6VHojhS2VCmDQVR19qUWcLPAt7sOhs8fGEOY6AskskY2xW0jvFpqiIfQeYMjiILactiuDWg0Mr9YxUgI96iZk2RtrTImRiYRp8%2B0qVJMjk7OV5df1lG6lrHpi0uagywkbTpnNpoBbfcI1LUwi8vAAA%2BAXV9OLPNKPizwt7U4ABcWiVk%2BQ9gayqvydiAjQunpdSq1600BW2YL%2FQQMtmsdaMDXF%2Bs%2FvCp0fB0vj7PiODbvn10%2F1MAT9lL9CHYyKiGVWOPoM18bd6Mz3CsDvMjUI3FeQZRvjUE1jyDHamVW2%2B4o3rqx60%2F9BcsxRyr4NX9CrRJ%2Fc1ae341jI0eksHVwmABD1XHFXp2HzlfJBs80PrXRk9EBsCKq107MoVhksGvEUzUwpxCxXYT3z8i7DmXEZf6HtYEVGkXZ2ZK%2F687GIyWYvQ760OVnEx%2BUWWPNE6EIXuzLMQ3yLHSsuoZnNPGWW1Ct%2BqEj8SxT%2BOMvGma06wC3hgQqhuSEek1wUHjcUrAvmm36A0GTGz1gKZDfN58axWl4BuxR8bOM59%2Fgan%2Fa5j6b%2FI0fR1GmTth9A4p%2FN36fay9TsOEXTbdkc2Rz9xyJxBufiRrlh5dLSQ%2F8mJGh9Q2VK5yoOClCMvFczYgW%2BTz6s1hkd3AYpXDYvGIc%2FZewO3coZ5p9tl4lz77MzSG3K0MJ%2B8wiGKvTQT7bNZZ2bN0d9CSzH6NqBh5ioOoW6QZJU8yjxn5Hxcflu8%2FrM%2BJ90hZWSJGf6Zrp7FWM2Wdrl99Wtnw0Jnp0gaWi%2FvImhc5LFL2%2BNdd4s2L1dPTah5f%2FljvdCGmJuHSY%2Bfi2b%2FxfvE%2BS7vZDzFyFmJ8d%2Fpgw%2FJMuzCn5SMLq1Xi%2BN2sesuzCv4SQZWHKBL2EIsfnSWEY894nxij8fHNeH6sdD2OxGeBmS3PpmT%2FLn55%2Fx28fvV2%2FMfTL5D9c0P2fhizqRo%2BF17H6vtWNEhOSIx5OqOYT3Sa3fLKN9qo%2Fve3seP6p273wM1hpz2Fd4gmB35X869%2FBwAA%2F%2F9VHIv4ORYAAA%3D%3D" title="Debug Queries">Debug Queries</a>
           
diff --git a/tooling/hcpctl/pkg/kusto/templates/custom/detailed_infra_orchestration_logs.kql.gotmpl b/tooling/hcpctl/pkg/kusto/templates/custom/detailed_infra_orchestration_logs.kql.gotmpl
index 17009a22023..dff43087b34 100644
--- a/tooling/hcpctl/pkg/kusto/templates/custom/detailed_infra_orchestration_logs.kql.gotmpl
+++ b/tooling/hcpctl/pkg/kusto/templates/custom/detailed_infra_orchestration_logs.kql.gotmpl
@@ -14,6 +14,7 @@ let maestro_resource_ids = (
     database('ServiceLogs').table('containerLogs')
     | where timestamp between (_startTime .. _endTime)
     | where namespace_name has "maestro"
+    | where isnotempty(cluster_id)
     | extend logStr = tostring(log)
     | where logStr has cluster_id
     | extend resourceId = extract(@'resourceid[=:"]+([a-f0-9\-]+)', 1, logStr)
@@ -28,8 +29,22 @@ union
         database('ServiceLogs').table('containerLogs')
         | where timestamp between (_startTime .. _endTime)
         | where namespace_name has "maestro"
+        | where isnotempty(cluster_id)
         | extend logStr = tostring(log)
-        | where logStr has cluster_id or logStr has_any (maestro_resource_ids)
+        | where logStr has cluster_id
+        | project timestamp, container_name, msg = logStr, log
+    ),
+    (
+        // Maestro logs: operations on associated resource IDs (joined to avoid has_any limit)
+        database('ServiceLogs').table('containerLogs')
+        | where timestamp between (_startTime .. _endTime)
+        | where namespace_name has "maestro"
+        | where isnotempty(cluster_id)
+        | extend logStr = tostring(log)
+        | extend resourceId = extract(@'resourceid[=:"]+([a-f0-9\-]+)', 1, logStr)
+        | where isnotempty(resourceId)
+        | where not(logStr has cluster_id)
+        | join kind=inner (maestro_resource_ids) on resourceId
         | project timestamp, container_name, msg = logStr, log
     ),
     (
@@ -38,6 +53,7 @@ union
         database('ServiceLogs').table('containerLogs')
         | where timestamp between (_startTime .. _endTime)
         | where namespace_name has "hypershift"
+        | where isnotempty(cluster_id)
         | extend logStr = tostring(log)
         | where logStr has cluster_id
         | project timestamp, container_name, msg = logStr, log
@@ -48,6 +64,7 @@ union
         database('ServiceLogs').table('containerLogs')
         | where timestamp between (_startTime .. _endTime)
         | where namespace_name has "open-cluster-management-agent"
+        | where isnotempty(cluster_id)
         | extend logStr = tostring(log)
         | where logStr has cluster_id
         | project timestamp, container_name, msg = logStr, log
diff --git a/tooling/hcpctl/testdata/zz_fixture_TestBuildAllCustomQueries.yaml b/tooling/hcpctl/testdata/zz_fixture_TestBuildAllCustomQueries.yaml
index c7495a4bbc0..50c5e626410 100644
--- a/tooling/hcpctl/testdata/zz_fixture_TestBuildAllCustomQueries.yaml
+++ b/tooling/hcpctl/testdata/zz_fixture_TestBuildAllCustomQueries.yaml
@@ -209,6 +209,7 @@
         database('ServiceLogs').table('containerLogs')
         | where timestamp between (_startTime .. _endTime)
         | where namespace_name has "maestro"
+        | where isnotempty(cluster_id)
         | extend logStr = tostring(log)
         | where logStr has cluster_id
         | extend resourceId = extract(@'resourceid[=:"]+([a-f0-9\-]+)', 1, logStr)
@@ -223,8 +224,22 @@
             database('ServiceLogs').table('containerLogs')
             | where timestamp between (_startTime .. _endTime)
             | where namespace_name has "maestro"
+            | where isnotempty(cluster_id)
             | extend logStr = tostring(log)
-            | where logStr has cluster_id or logStr has_any (maestro_resource_ids)
+            | where logStr has cluster_id
+            | project timestamp, container_name, msg = logStr, log
+        ),
+        (
+            // Maestro logs: operations on associated resource IDs (joined to avoid has_any limit)
+            database('ServiceLogs').table('containerLogs')
+            | where timestamp between (_startTime .. _endTime)
+            | where namespace_name has "maestro"
+            | where isnotempty(cluster_id)
+            | extend logStr = tostring(log)
+            | extend resourceId = extract(@'resourceid[=:"]+([a-f0-9\-]+)', 1, logStr)
+            | where isnotempty(resourceId)
+            | where not(logStr has cluster_id)
+            | join kind=inner (maestro_resource_ids) on resourceId
             | project timestamp, container_name, msg = logStr, log
         ),
         (
@@ -233,6 +248,7 @@
             database('ServiceLogs').table('containerLogs')
             | where timestamp between (_startTime .. _endTime)
             | where namespace_name has "hypershift"
+            | where isnotempty(cluster_id)
             | extend logStr = tostring(log)
             | where logStr has cluster_id
             | project timestamp, container_name, msg = logStr, log
@@ -243,6 +259,7 @@
             database('ServiceLogs').table('containerLogs')
             | where timestamp between (_startTime .. _endTime)
             | where namespace_name has "open-cluster-management-agent"
+            | where isnotempty(cluster_id)
             | extend logStr = tostring(log)
             | where logStr has cluster_id
             | project timestamp, container_name, msg = logStr, log
diff --git a/tooling/hcpctl/testdata/zz_fixture_TestBuildMerged_MultipleChildren.yaml b/tooling/hcpctl/testdata/zz_fixture_TestBuildMerged_MultipleChildren.yaml
index 445ff595ded..951bf6549ac 100644
--- a/tooling/hcpctl/testdata/zz_fixture_TestBuildMerged_MultipleChildren.yaml
+++ b/tooling/hcpctl/testdata/zz_fixture_TestBuildMerged_MultipleChildren.yaml
@@ -73,6 +73,7 @@ kql: |-
       database('ServiceLogs').table('containerLogs')
       | where timestamp between (_startTime .. _endTime)
       | where namespace_name has "maestro"
+      | where isnotempty(cluster_id)
       | extend logStr = tostring(log)
       | where logStr has cluster_id
       | extend resourceId = extract(@'resourceid[=:"]+([a-f0-9\-]+)', 1, logStr)
@@ -87,8 +88,22 @@ kql: |-
           database('ServiceLogs').table('containerLogs')
           | where timestamp between (_startTime .. _endTime)
           | where namespace_name has "maestro"
+          | where isnotempty(cluster_id)
           | extend logStr = tostring(log)
-          | where logStr has cluster_id or logStr has_any (maestro_resource_ids)
+          | where logStr has cluster_id
+          | project timestamp, container_name, msg = logStr, log
+      ),
+      (
+          // Maestro logs: operations on associated resource IDs (joined to avoid has_any limit)
+          database('ServiceLogs').table('containerLogs')
+          | where timestamp between (_startTime .. _endTime)
+          | where namespace_name has "maestro"
+          | where isnotempty(cluster_id)
+          | extend logStr = tostring(log)
+          | extend resourceId = extract(@'resourceid[=:"]+([a-f0-9\-]+)', 1, logStr)
+          | where isnotempty(resourceId)
+          | where not(logStr has cluster_id)
+          | join kind=inner (maestro_resource_ids) on resourceId
           | project timestamp, container_name, msg = logStr, log
       ),
       (
@@ -97,6 +112,7 @@ kql: |-
           database('ServiceLogs').table('containerLogs')
           | where timestamp between (_startTime .. _endTime)
           | where namespace_name has "hypershift"
+          | where isnotempty(cluster_id)
           | extend logStr = tostring(log)
           | where logStr has cluster_id
           | project timestamp, container_name, msg = logStr, log
@@ -107,6 +123,7 @@ kql: |-
           database('ServiceLogs').table('containerLogs')
           | where timestamp between (_startTime .. _endTime)
           | where namespace_name has "open-cluster-management-agent"
+          | where isnotempty(cluster_id)
           | extend logStr = tostring(log)
           | where logStr has cluster_id
           | project timestamp, container_name, msg = logStr, log