From bbde13ed5dde6e461926fd2372413c9bab6bcd10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20K=C5=82ys?= <przemyslaw.klys@evotec.pl>
Date: Sat, 3 Oct 2026 21:13:41 +0200
Subject: [PATCH 1/4] Fix report rendering, filtering and export data
 preservation

---
 CHANGELOG.MD                                  |  15 +-
 Private/ChartsAll/New-ApexChart.ps1           |  18 +-
 Private/ConvertFrom-HTMLTextLink.ps1          |  13 +
 Private/ConvertTo-HTMLScriptJson.ps1          |  22 ++
 Private/New-InternalDiagram.ps1               |   6 +-
 Private/New-TableServerSide.ps1               |   9 +-
 Private/Protect-HTMLScriptData.ps1            |  11 +
 Private/Resolve-HTMLMarkdownImages.ps1        |  40 +++
 Private/Tables/Add-TableContent.ps1           | 108 +------
 Private/Tables/Add-TableFiltering.ps1         | 182 ++++--------
 Private/Tables/Add-TableRowGrouping.ps1       |  54 +---
 Private/Tables/Add-TableState.ps1             |  85 ------
 Private/Tables/Convert-TableRowGrouping.ps1   |  82 ++---
 Private/Tables/Get-TableExportScript.ps1      |  27 ++
 Private/Tables/Get-TableInlineStyles.ps1      |  62 ++++
 .../New-TableConditionalFormattingInline.ps1  |   6 +-
 Private/Tables/Set-TableButtons.ps1           | 144 +++++++++
 Public/New-HTMLCalendar.ps1                   |   2 +-
 Public/New-HTMLCarousel.ps1                   |   2 +-
 Public/New-HTMLDiagram.ps1                    |   6 +-
 Public/New-HTMLGage.ps1                       |   4 +-
 Public/New-HTMLMap.ps1                        |   2 +-
 Public/New-HTMLMarkdown.ps1                   |  29 +-
 Public/New-HTMLOrgChart.ps1                   |   2 +-
 Public/New-HTMLQRCode.ps1                     |   4 +-
 Public/New-HTMLTab.ps1                        |   7 +-
 Public/New-HTMLTabPanel.ps1                   |   2 +-
 Public/New-HTMLTable.ps1                      | 281 ++++--------------
 Public/New-HTMLTableStyle.ps1                 |   5 +-
 Public/New-HTMLText.ps1                       |  44 +--
 Public/New-HTMLTree.ps1                       |   2 +-
 Public/New-HTMLWinBox.ps1                     |   2 +-
 Public/New-NavTopMenu.ps1                     |   7 +-
 Public/New-TableButtonCSV.ps1                 |   9 +-
 Public/New-TableButtonExcel.ps1               |   9 +-
 Public/New-TableHeader.ps1                    |  11 +
 Resources/JS/pswritehtml-table-export.js      |  91 ++++++
 Resources/JS/tabbisNavigation.js              |  64 ++++
 Tests/ReportCorrectness.Tests.ps1             | 127 ++++++++
 readme.md                                     |  21 ++
 40 files changed, 895 insertions(+), 722 deletions(-)
 create mode 100644 Private/ConvertFrom-HTMLTextLink.ps1
 create mode 100644 Private/ConvertTo-HTMLScriptJson.ps1
 create mode 100644 Private/Protect-HTMLScriptData.ps1
 create mode 100644 Private/Resolve-HTMLMarkdownImages.ps1
 delete mode 100644 Private/Tables/Add-TableState.ps1
 create mode 100644 Private/Tables/Get-TableExportScript.ps1
 create mode 100644 Private/Tables/Get-TableInlineStyles.ps1
 create mode 100644 Private/Tables/Set-TableButtons.ps1
 create mode 100644 Resources/JS/pswritehtml-table-export.js
 create mode 100644 Resources/JS/tabbisNavigation.js
 create mode 100644 Tests/ReportCorrectness.Tests.ps1

diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 13f3ef8a..ae144b09 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -4,6 +4,19 @@
 Unfortunetly some code is very old, some code doesn't serve it's purpose anymore, and requires heavy changes that may have an impact on already deployed code.
 Please make sure to read changes before updating, as we're undergoing some breaking changes.
 
+## 1.42.0
+
+- Table exports support explicit row scopes with `-ExportScope`. Excel retains long numeric identifiers as text and supports named `-TextColumns`.
+- CSV exports quote fields and protect formula-like text. `New-TableButtonCSV -RawData` retains those values for programmatic consumers.
+- Column filters preserve header names, restore saved searches, and follow column visibility. Search panes support named column selection with `-SearchPaneColumns`.
+- Row grouping supports multiple levels, independent collapse state, and responsive child rows.
+- Inline table conditions can read excluded helper properties, and table rendering preserves the caller's arrays and dates.
+- Nested tabs initialize their tables correctly and support deep links and keyboard navigation. Top menu headings follow their configured destinations.
+- Markdown preserves backslashes and multiline content, embeds relative local images, and supports `-ImageBase` and `-EmbedImages`.
+- Text links support parenthesized labels and nested parentheses in URLs. Merged table titles and column names support independent alignment.
+- Chart and widget serialization preserves quoted strings and keeps data containing HTML script delimiters inside its script value. Ajax table files use UTF-8 on both PowerShell runtimes.
+- Selected-row hover backgrounds apply to odd and even rows.
+
 ## 1.36.0
 ### What's new
 - Improvements to null handlings in New-HTMLTable
@@ -1170,4 +1183,4 @@ New-HTML -TitleText 'Title' -Online -FilePath $PSScriptRoot\Example-TableColumnV
 
 ## 0.0.33 - 2019.05.28
   - New-HTMLTable - Sorting ordered for DateTime - PR by Ferdi Weiner (ferwe)
-  - Removed New-HTMLChart temporary as it will be rebuilt
\ No newline at end of file
+  - Removed New-HTMLChart temporary as it will be rebuilt
diff --git a/Private/ChartsAll/New-ApexChart.ps1 b/Private/ChartsAll/New-ApexChart.ps1
index 02307d07..7c2ce5a7 100644
--- a/Private/ChartsAll/New-ApexChart.ps1
+++ b/Private/ChartsAll/New-ApexChart.ps1
@@ -1,4 +1,4 @@
-function New-ApexChart {
+function New-ApexChart {
     <#
     .SYNOPSIS
     Creates a new ApexChart with the specified options and events.
@@ -53,19 +53,19 @@ function New-ApexChart {
         # Convert Dictionary to JSON and return chart within SCRIPT tag
         # Make sure to return with additional empty string
         Remove-EmptyValue -Hashtable $Options -Recursive -Rerun 2
-        $JSON = $Options | ConvertTo-JsonLiteral -Depth 5 -AdvancedReplace @{ '.' = '\.'; '$' = '\$' }
-        # replaces stuff for TImeLineCharts
-        $JSON = $JSON.Replace('"new Date(', 'new Date(').Replace(').getTime()"', ').getTime()')
+        $JSON = $Options | ConvertTo-HTMLScriptJson -Depth 20
 
         # We replace Events on JSON because there's no other way that I can think of
         if ($Options.chart.events) {
-            $JSON = $JSON -replace ('"events":"EventsReplaceMe"', $Events)
+            $JSON = [regex]::Replace($JSON, '"events"\s*:\s*"EventsReplaceMe"', { $Events })
         }
 
-        $JSON = $JSON | ForEach-Object { [System.Text.RegularExpressions.Regex]::Unescape($_) }
-
         "var options = $JSON"
-        "var chart = new ApexCharts(document.querySelector('#$ID'),
+        # Timeline producers return date expressions as data. Parse their date
+        # argument without evaluating text or unescaping the whole JSON object.
+        'if (options.chart.type === "rangeBar") { options.series.forEach(function (series) { series.data.forEach(function (point) { if (Array.isArray(point.y)) { point.y = point.y.map(function (value) { var match = typeof value === "string" && /^new Date\(''([\s\S]*)''\)\.getTime\(\)$/.exec(value); return match ? new Date(match[1]).getTime() : value; }); } }); }); }'
+        $IDJson = ConvertTo-HTMLScriptJson -InputObject $Options.chart.id -Compress
+        "var chart = new ApexCharts(document.getElementById($IDJson),
             options
         );"
         "chart.render();"
@@ -73,4 +73,4 @@ function New-ApexChart {
     $Div
     # we need to move it to the end of the code therefore using additional vesel
     $Script:HTMLSchema.Charts.Add($Script)
-}
\ No newline at end of file
+}
diff --git a/Private/ConvertFrom-HTMLTextLink.ps1 b/Private/ConvertFrom-HTMLTextLink.ps1
new file mode 100644
index 00000000..837756b9
--- /dev/null
+++ b/Private/ConvertFrom-HTMLTextLink.ps1
@@ -0,0 +1,13 @@
+function ConvertFrom-HTMLTextLink {
+    <#
+    .SYNOPSIS
+    Converts inline text links with independently captured labels and balanced destinations.
+    #>
+    [CmdletBinding()]
+    param([AllowEmptyString()][string] $Text)
+    $Pattern = '\[(?<Label>[^\]]+)\]\((?<Url>(?:[^()\s]|\((?<Depth>)|\)(?<-Depth>))+)(?(Depth)(?!))\)'
+    [regex]::Replace($Text, $Pattern, [System.Text.RegularExpressions.MatchEvaluator]{
+        param($Match)
+        New-HTMLAnchor -HrefLink $Match.Groups['Url'].Value -Text $Match.Groups['Label'].Value
+    })
+}
diff --git a/Private/ConvertTo-HTMLScriptJson.ps1 b/Private/ConvertTo-HTMLScriptJson.ps1
new file mode 100644
index 00000000..6fcee8ed
--- /dev/null
+++ b/Private/ConvertTo-HTMLScriptJson.ps1
@@ -0,0 +1,22 @@
+function ConvertTo-HTMLScriptJson {
+    <#
+    .SYNOPSIS
+    Serializes data for an inline HTML script without changing its string values.
+    .DESCRIPTION
+    Uses PowerShell JSON serialization and escapes HTML raw-text delimiters and
+    JavaScript line separators. Executable callbacks must be added separately.
+    #>
+    [CmdletBinding()]
+    param(
+        [Parameter(ValueFromPipeline)][AllowNull()][object] $InputObject,
+        [ValidateRange(1, 100)][int] $Depth = 20,
+        [switch] $Compress
+    )
+    begin { $Items = [System.Collections.Generic.List[object]]::new() }
+    process { $Items.Add($InputObject) }
+    end {
+        if ($Items.Count -eq 1) { $Value = $Items[0] } elseif ($Items.Count -gt 1) { $Value = $Items.ToArray() } else { $Value = $null }
+        $Json = ConvertTo-Json -InputObject $Value -Depth $Depth -Compress:$Compress
+        Protect-HTMLScriptData -Json $Json
+    }
+}
diff --git a/Private/New-InternalDiagram.ps1 b/Private/New-InternalDiagram.ps1
index 91c85d22..ebaf63a3 100644
--- a/Private/New-InternalDiagram.ps1
+++ b/Private/New-InternalDiagram.ps1
@@ -1,4 +1,4 @@
-function New-InternalDiagram {
+function New-InternalDiagram {
     <#
     .SYNOPSIS
     Creates a new internal diagram with specified nodes, edges, events, options, dimensions, and styling.
@@ -188,7 +188,7 @@ function New-InternalDiagram {
         " }; "
 
         if ($Options) {
-            $ConvertedOptions = $Options | ConvertTo-Json -Depth 5 | ForEach-Object { [System.Text.RegularExpressions.Regex]::Unescape($_) }
+            $ConvertedOptions = $Options | ConvertTo-HTMLScriptJson -Depth 20
             "var options = $ConvertedOptions; "
         } else {
             "var options = { }; "
@@ -208,4 +208,4 @@ function New-InternalDiagram {
 
     $Div
     $Script:HTMLSchema.Diagrams.Add($Script)
-}
\ No newline at end of file
+}
diff --git a/Private/New-TableServerSide.ps1 b/Private/New-TableServerSide.ps1
index f9306b6c..af1ba206 100644
--- a/Private/New-TableServerSide.ps1
+++ b/Private/New-TableServerSide.ps1
@@ -38,11 +38,12 @@
             data = $DataTable
         }
 
-        $Data | ConvertTo-JsonLiteral -Depth 1 `
+        $Json = $Data | ConvertTo-JsonLiteral -Depth 1 `
             -NumberAsString:$Script:HTMLSchema['TableOptions']['DataStoreOptions'].NumberAsString `
             -BoolAsString:$Script:HTMLSchema['TableOptions']['DataStoreOptions'].BoolAsString `
-            -DateTimeFormat $Script:HTMLSchema['TableOptions']['DataStoreOptions'].DateTimeFormat | Out-File -FilePath $FilePath
-        $Options['ajax'] = -join ('data', '\', "$DataTableID.json")
+            -DateTimeFormat $Script:HTMLSchema['TableOptions']['DataStoreOptions'].DateTimeFormat
+        [System.IO.File]::WriteAllText($FilePath, $Json, [System.Text.UTF8Encoding]::new($false))
+        $Options['ajax'] = "data/$DataTableID.json"
     } else {
         # there is possibility for array without column names, not sure if it's worth the time
     }
@@ -51,4 +52,4 @@
         @{ data = $Property.Replace('.', '\.') }
     }
     $Options['deferRender'] = $true
-}
\ No newline at end of file
+}
diff --git a/Private/Protect-HTMLScriptData.ps1 b/Private/Protect-HTMLScriptData.ps1
new file mode 100644
index 00000000..31b33705
--- /dev/null
+++ b/Private/Protect-HTMLScriptData.ps1
@@ -0,0 +1,11 @@
+function Protect-HTMLScriptData {
+    <#
+    .SYNOPSIS
+    Escapes HTML raw-text boundaries in already serialized script data.
+    #>
+    [CmdletBinding()]
+    param([Parameter(ValueFromPipeline)][AllowEmptyString()][string] $Json)
+    process {
+        $Json.Replace('<', '\u003c').Replace('>', '\u003e').Replace('&', '\u0026').Replace([string][char]0x2028, '\u2028').Replace([string][char]0x2029, '\u2029')
+    }
+}
diff --git a/Private/Resolve-HTMLMarkdownImages.ps1 b/Private/Resolve-HTMLMarkdownImages.ps1
new file mode 100644
index 00000000..58b1832e
--- /dev/null
+++ b/Private/Resolve-HTMLMarkdownImages.ps1
@@ -0,0 +1,40 @@
+function Resolve-HTMLMarkdownImages {
+    <#
+    .SYNOPSIS
+    Embeds relative Markdown image files contained beneath an explicit source directory.
+    #>
+    [CmdletBinding()]
+    param([string] $Content, [string] $ImageBase)
+    $BasePath = [IO.Path]::GetFullPath((Convert-Path -LiteralPath $ImageBase))
+    $Prefix = $BasePath.TrimEnd([IO.Path]::DirectorySeparatorChar, [IO.Path]::AltDirectorySeparatorChar) + [IO.Path]::DirectorySeparatorChar
+    $Comparison = if ([IO.Path]::DirectorySeparatorChar -eq '\') { [StringComparison]::OrdinalIgnoreCase } else { [StringComparison]::Ordinal }
+    $ImageReferences = @(foreach ($Reference in [regex]::Matches($Content, '!\[(?<Label>[^\]]*)\](?:\[(?<Reference>[^\]]*)\])?(?!\()')) {
+        if ($Reference.Groups['Reference'].Value) { $Reference.Groups['Reference'].Value } else { $Reference.Groups['Label'].Value }
+    })
+    # Inline images and image reference definitions retain their label and optional title.
+    $Pattern = '(?<Prefix>!\[[^\]]*\]\(\s*|(?m:^\s*\[[^\]]+\]:\s*))(?<Path><[^>]+>|(?:[^()\s]|\((?<Depth>)|\)(?<-Depth>))+)(?(Depth)(?!))'
+    [regex]::Replace($Content, $Pattern, [System.Text.RegularExpressions.MatchEvaluator]{
+        param($Match)
+        if (-not $Match.Groups['Prefix'].Value.StartsWith('!')) {
+            $Reference = [regex]::Match($Match.Groups['Prefix'].Value, '\[([^\]]+)\]').Groups[1].Value
+            if ($ImageReferences -notcontains $Reference) { return $Match.Value }
+        }
+        $Path = $Match.Groups['Path'].Value.Trim('<', '>')
+        if ($Path -match '^[a-z][a-z0-9+.-]*:|^[/\\]' -or $Path.StartsWith('#')) { return $Match.Value }
+        $Relative = [Uri]::UnescapeDataString(($Path -split '[?#]', 2)[0]).Replace('/', [IO.Path]::DirectorySeparatorChar)
+        $Candidate = [IO.Path]::GetFullPath((Join-Path $BasePath $Relative))
+        if (-not $Candidate.StartsWith($Prefix, $Comparison) -or -not [IO.File]::Exists($Candidate)) { return $Match.Value }
+        if ([IO.Path]::GetExtension($Candidate) -notin '.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg', '.bmp', '.ico', '.tif', '.tiff') { return $Match.Value }
+        # Do not follow junctions or symlinks outside the permitted image source tree.
+        $Item = Get-Item -LiteralPath $Candidate
+        if ($Item.Attributes -band [IO.FileAttributes]::ReparsePoint) { return $Match.Value }
+        $Directory = $Item.Directory
+        while ($Directory -and $Directory.FullName.StartsWith($Prefix, $Comparison)) {
+            if ($Directory.Attributes -band [IO.FileAttributes]::ReparsePoint) { return $Match.Value }
+            $Directory = $Directory.Parent
+        }
+        $DataUri = Convert-ImageToBinary -ImageFile $Candidate
+        if ($DataUri -notlike 'data:image/*') { return $Match.Value }
+        $Match.Groups['Prefix'].Value + $DataUri
+    })
+}
diff --git a/Private/Tables/Add-TableContent.ps1 b/Private/Tables/Add-TableContent.ps1
index 3b096a86..861f234e 100644
--- a/Private/Tables/Add-TableContent.ps1
+++ b/Private/Tables/Add-TableContent.ps1
@@ -36,111 +36,13 @@
         [System.Collections.Generic.List[PSCUstomObject]] $ContentTop,
         [System.Collections.Generic.List[PSCUstomObject]] $ContentFormattingInline,
         [string[]] $HeaderNames,
-        [Array] $Table
+        [Array] $Table,
+        [Array] $SourceRows
     )
 
-    # This converts inline conditonal formatting into style. It's intensive because it actually scans whole Table
-    # During scan it tries to match things and when it finds a match it prepares it for ContentStyling feature
-    if ($ContentFormattingInline.Count -gt 0) {
-        [Array] $AddStyles = for ($RowCount = 1; $RowCount -lt $Table.Count; $RowCount++) {
-            [string[]] $RowData = $Table[$RowCount] -replace '</td></tr>' -replace '<tr><td>' -split '</td><td>'
-            foreach ($ConditionalFormatting in $ContentFormattingInline) {
-                $Pass = $false
-                if ($ConditionalFormatting.ConditionType -eq 'Condition') {
-                    $ColumnIndexHeader = [array]::indexof($HeaderNames.ToUpper(), $($ConditionalFormatting.Name).ToUpper())
-                    for ($ColumnCount = 0; $ColumnCount -lt $RowData.Count; $ColumnCount++) {
-                        #Write-Color "1ColumnCount $ColumnCount / $RowCount"
-                        if ($ColumnIndexHeader -eq $ColumnCount) {
-                            $Pass = New-TableConditionalFormattingInline -HeaderNames $HeaderNames -ColumnIndexHeader $ColumnIndexHeader -RowCount $RowCount -ColumnCount $ColumnCount -RowData $RowData -ConditionalFormatting $ConditionalFormatting
-                            break
-                        }
-                    }
-                } else {
-                    [Array] $IsConditionTrue = foreach ($SubCondition in $ConditionalFormatting.Conditions.Output) {
-                        $ColumnIndexHeader = [array]::indexof($HeaderNames.ToUpper(), $($SubCondition.Name).ToUpper())
-                        for ($ColumnCount = 0; $ColumnCount -lt $RowData.Count; $ColumnCount++) {
-                            #Write-Color "2ColumnCount $ColumnCount / $RowCount"
-                            if ($ColumnIndexHeader -eq $ColumnCount) {
-                                New-TableConditionalFormattingInline -HeaderNames $HeaderNames -ColumnIndexHeader $ColumnIndexHeader -RowCount $RowCount -ColumnCount $ColumnCount -RowData $RowData -ConditionalFormatting $SubCondition
-                            }
-                        }
-                    }
-                    if ($ConditionalFormatting.Logic -eq 'AND') {
-                        if ($IsConditionTrue -contains $true -and $IsConditionTrue -notcontains $false) {
-                            $Pass = $true
-                        }
-                    } elseif ($ConditionalFormatting.Logic -eq 'OR') {
-                        if ($IsConditionTrue -contains $true) {
-                            $Pass = $true
-                        }
-                    } elseif ($ConditionalFormatting.Logic -eq 'NONE') {
-                        if ($IsConditionTrue -contains $false -and $IsConditionTrue -notcontains $true) {
-                            $Pass = $true
-                        }
-                    }
-                }
-                if ($Pass) {
-                    # If we want to make conditional formatting for row it requires a bit diff approach
-                    if ($ConditionalFormatting.Row) {
-                        for ($i = 0; $i -lt $RowData.Count; $i++) {
-                            [PSCustomObject]@{
-                                RowIndex    = $RowCount
-                                ColumnIndex = ($i + 1)  # Since it's 0 based index and we count from 1 we need to add 1
-                                Style       = $ConditionalFormatting.Style
-                            }
-                        }
-                    } elseif ($ConditionalFormatting.HighlightHeaders) {
-                        foreach ($Name in $ConditionalFormatting.HighlightHeaders) {
-                            $ColumnIndexHighlight = [array]::indexof($HeaderNames.ToUpper(), $($Name).ToUpper())
-                            [PSCustomObject]@{
-                                RowIndex    = $RowCount
-                                ColumnIndex = ($ColumnIndexHighlight + 1) # Since it's 0 based index and we count from 1 we need to add 1
-                                Style       = $ConditionalFormatting.Style
-                            }
-                        }
-                    } else {
-                        [PSCustomObject]@{
-                            RowIndex    = $RowCount
-                            ColumnIndex = ($ColumnIndexHeader + 1)  # Since it's 0 based index and we count from 1 we need to add 1
-                            Style       = $ConditionalFormatting.Style
-                        }
-                    }
-                } else {
-                    if ($ConditionalFormatting.FailStyle.Keys.Count -gt 0) {
-                        if ($ConditionalFormatting.Row) {
-                            for ($i = 0; $i -lt $RowData.Count; $i++) {
-                                [PSCustomObject]@{
-                                    RowIndex    = $RowCount
-                                    ColumnIndex = ($i + 1)  # Since it's 0 based index and we count from 1 we need to add 1
-                                    Style       = $ConditionalFormatting.FailStyle
-                                }
-                            }
-                        } elseif ($ConditionalFormatting.HighlightHeaders) {
-                            foreach ($Name in $ConditionalFormatting.HighlightHeaders) {
-                                $ColumnIndexHighlight = [array]::indexof($HeaderNames.ToUpper(), $($Name).ToUpper())
-                                [PSCustomObject]@{
-                                    RowIndex    = $RowCount
-                                    ColumnIndex = ($ColumnIndexHighlight + 1) # Since it's 0 based index and we count from 1 we need to add 1
-                                    Style       = $ConditionalFormatting.FailStyle
-                                }
-                            }
-                        } else {
-                            [PSCustomObject]@{
-                                RowIndex    = $RowCount
-                                ColumnIndex = ($ColumnIndexHeader + 1)  # Since it's 0 based index and we count from 1 we need to add 1
-                                Style       = $ConditionalFormatting.FailStyle
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        # This makes conditional forwarding a ContentStyle
-        foreach ($Style in $AddStyles) {
-            $ContentStyle.Add($Style)
-        }
+    foreach ($Style in (Get-TableInlineStyles -Table $Table -HeaderNames $HeaderNames -SourceRows $SourceRows -Conditions $ContentFormattingInline)) {
+        $ContentStyle.Add($Style)
     }
-
     # Prepopulate hashtable with rows
     $TableRows = @{ }
     if ($ContentStyle) {
@@ -293,4 +195,4 @@
         }
     }
     $NewTable
-}
\ No newline at end of file
+}
diff --git a/Private/Tables/Add-TableFiltering.ps1 b/Private/Tables/Add-TableFiltering.ps1
index ac8a98da..a114ac4f 100644
--- a/Private/Tables/Add-TableFiltering.ps1
+++ b/Private/Tables/Add-TableFiltering.ps1
@@ -1,144 +1,64 @@
-function Add-TableFiltering {
+function Add-TableFiltering {
     <#
     .SYNOPSIS
-    Adds filtering functionality to a DataTable.
-
-    .DESCRIPTION
-    This function adds filtering functionality to a DataTable by allowing users to search for specific data within the table.
-
-    .PARAMETER Filtering
-    Specifies whether filtering functionality should be enabled.
-
-    .PARAMETER FilteringLocation
-    Specifies the location of the filtering input box. Valid values are 'Top', 'Bottom', or 'Both'.
-
-    .PARAMETER DataTableName
-    Specifies the name of the DataTable to which filtering will be applied.
-
-    .PARAMETER SearchRegularExpression
-    Indicates whether the search should be treated as a regular expression.
-
-    .EXAMPLE
-    Add-TableFiltering -Filtering $true -FilteringLocation 'Bottom' -DataTableName 'myTable'
-
-    Adds filtering functionality to the DataTable named 'myTable' at the bottom of the table.
-
-    .EXAMPLE
-    Add-TableFiltering -Filtering $true -FilteringLocation 'Both' -DataTableName 'myTable' -SearchRegularExpression
-
-    Adds filtering functionality to the DataTable named 'myTable' at both the top and bottom of the table, treating the search as a regular expression.
-
+    Adds column filters without replacing semantic column titles.
     #>
     [CmdletBinding()]
     param(
         [bool] $Filtering,
-        [ValidateSet('Top', 'Bottom', 'Both')][string]$FilteringLocation = 'Bottom',
+        [ValidateSet('Top', 'Bottom', 'Both')][string] $FilteringLocation = 'Bottom',
         [string] $DataTableName,
-        [alias('RegularExpression')][switch]$SearchRegularExpression
+        [string[]] $HeaderNames,
+        [alias('RegularExpression')][switch] $SearchRegularExpression
     )
-
-    if ($SearchRegularExpression.IsPresent) {
-        [string]$JSDataTableRegEx = 'true'
-        [string]$JSDataTableSmart = 'false'
-    } else {
-        [string]$JSDataTableRegEx = 'false'
-        [string]$JSDataTableSmart = 'true'
-    }
-    
-    $Output = @{}
-    if ($Filtering) {
-        # https://datatables.net/examples/api/multi_filter.html
-
-        if ($FilteringLocation -eq 'Bottom') {
-
-            $Output.FilteringTopCode = @"
-                // Setup - add a text input to each footer cell
-                `$('#$DataTableName tfoot tr:not(.pswritehtml-static-footer-row) th').each(function () {
-                    var title = `$(this).text();
-                    `$(this).html('<input type="text" placeholder="' + title + '" />');
-                });
-"@
-            $Output.FilteringBottomCode = @"
-                // Apply the search for footer cells
-                table.columns().every(function () {
-                    var that = this;
-
-                    `$('input', this.footer()).on('keyup change', function () {
-                        if (that.search() !== this.value) {
-                            that.search(this.value, $JSDataTableRegEx, $JSDataTableSmart).draw();
-                        }
-                    });
-                });
-"@
-
-        } elseif ($FilteringLocation -eq 'Both') {
-
-            $Output.FilteringTopCode = @"
-                // Setup - add a text input to each header cell
-                `$('#$DataTableName thead th').each(function () {
-                    var title = `$(this).text();
-                    `$(this).html('<input type="text" placeholder="' + title + '" />');
-                });
-                // Setup - add a text input to each footer cell
-                `$('#$DataTableName tfoot tr:not(.pswritehtml-static-footer-row) th').each(function () {
-                    var title = `$(this).text();
-                    `$(this).html('<input type="text" placeholder="' + title + '" />');
-                });
-"@
-            $Output.FilteringBottomCode = @"
-                // Apply the search for header cells
-                table.columns().eq(0).each(function (colIdx) {
-                    `$('input', table.column(colIdx).header()).on('keyup change', function () {
-                        table
-                            .column(colIdx)
-                            .search(this.value)
-                            .draw();
-                    });
-
-                    `$('input', table.column(colIdx).header()).on('click', function (e) {
-                        e.stopPropagation();
-                    });
-                });
-                // Apply the search for footer cells
-                table.columns().every(function () {
-                    var that = this;
-
-                    `$('input', this.footer()).on('keyup change', function () {
-                        if (that.search() !== this.value) {
-                            that.search(this.value, $JSDataTableRegEx, $JSDataTableSmart).draw();
-                        }
-                    });
-                });
-"@
-
-        } else {
-            # top headers
-            $Output.FilteringTopCode = @"
-                // Setup - add a text input to each header cell
-                `$('#$DataTableName thead th').each(function () {
-                    var title = `$(this).text();
-                    `$(this).html('<input type="text" placeholder="' + title + '" />');
-                });
+    $Output = @{ FilteringTopCode = ''; FilteringBottomCode = '' }
+    if (-not $Filtering) { return $Output }
+    $RegEx = $SearchRegularExpression.IsPresent.ToString().ToLowerInvariant()
+    $Smart = (-not $SearchRegularExpression.IsPresent).ToString().ToLowerInvariant()
+    if ($FilteringLocation -in 'Top', 'Both') {
+        $Titles = ConvertTo-HTMLScriptJson -InputObject @($HeaderNames | ForEach-Object { [Net.WebUtility]::HtmlDecode($_) }) -Compress
+        $Output.FilteringTopCode += @"
+        var filterRow = `$('<tr/>', {'class': 'pswritehtml-filter-row'});
+        $Titles.forEach(function (title, index) {
+            filterRow.append(`$('<th/>').append(`$('<input/>', {
+                type: 'text', placeholder: title, 'aria-label': 'Search ' + title, 'data-column': index
+            })));
+        });
+        filterRow.prependTo('#$DataTableName thead');
 "@
-
-            $Output.FilteringBottomCode = @"
-                // Apply the search for header cells
-                table.columns().eq(0).each(function (colIdx) {
-                    `$('input', table.column(colIdx).header()).on('keyup change', function () {
-                        table
-                            .column(colIdx)
-                            .search(this.value)
-                            .draw();
-                    });
-
-                    `$('input', table.column(colIdx).header()).on('click', function (e) {
-                        e.stopPropagation();
-                    });
-                });
+    }
+    if ($FilteringLocation -in 'Bottom', 'Both') {
+        $Output.FilteringTopCode += @"
+        `$('#$DataTableName tfoot tr:not(.pswritehtml-static-footer-row) th').each(function () {
+            var title = `$(this).text();
+            `$(this).empty().append(`$('<input/>', {type: 'text', placeholder: title, 'aria-label': 'Search ' + title}));
+        });
 "@
-        }
-    } else {
-        $Output.FilteringTopCode = $Output.FilteringBottomCode = '' # assign multiple same values trick
     }
+    $Output.FilteringBottomCode = @"
+        var filterInputs = `$('#$DataTableName thead .pswritehtml-filter-row input, #$DataTableName tfoot tr:not(.pswritehtml-static-footer-row) input');
+        filterInputs.each(function () {
+            var input = this;
+            table.columns().every(function () {
+                if (`$(this.header()).text() === input.placeholder) { `$(input).data('pswh-header', this.header()); }
+            });
+        }).on('keyup change', function () {
+            var header = `$(this).data('pswh-header');
+            if (!header) { return; }
+            var column = table.column(header);
+            if (column.search() !== this.value) { column.search(this.value, $RegEx, $Smart).draw(); }
+        }).on('click', function (event) { event.stopPropagation(); });
+        function syncColumnFilters() {
+            filterInputs.each(function () {
+                var header = `$(this).data('pswh-header');
+                if (!header) { return; }
+                var column = table.column(header);
+                `$(this).val(column.search());
+                `$(this).closest('th').toggle(column.visible() && `$(header).css('display') !== 'none');
+            });
+        }
+        table.on('draw.dt responsive-resize.dt column-visibility.dt column-reorder.dt', syncColumnFilters);
+        syncColumnFilters();
+"@
     return $Output
 }
diff --git a/Private/Tables/Add-TableRowGrouping.ps1 b/Private/Tables/Add-TableRowGrouping.ps1
index f074834b..432007c2 100644
--- a/Private/Tables/Add-TableRowGrouping.ps1
+++ b/Private/Tables/Add-TableRowGrouping.ps1
@@ -1,54 +1,32 @@
 function Add-TableRowGrouping {
     <#
     .SYNOPSIS
-    Adds row grouping functionality to a DataTable.
-
-    .DESCRIPTION
-    This function adds row grouping functionality to a DataTable based on the provided settings. It allows collapsing and expanding groups of rows.
-
-    .PARAMETER DataTableName
-    The name of the DataTable to which row grouping will be applied.
-
-    .PARAMETER Settings
-    A dictionary containing settings for row grouping.
-
-    .PARAMETER Top
-    Indicates whether to add row grouping at the top of the table.
-
-    .PARAMETER Bottom
-    Indicates whether to add row grouping at the bottom of the table.
-
-    .EXAMPLE
-    Add-TableRowGrouping -DataTableName "myTable" -Settings @{ "group1" = "Group 1"; "group2" = "Group 2" } -Top
-
-    Adds row grouping at the top of the table "myTable" with groups "Group 1" and "Group 2".
-
-    .EXAMPLE
-    Add-TableRowGrouping -DataTableName "anotherTable" -Settings @{ "groupA" = "Group A"; "groupB" = "Group B" } -Bottom
-
-    Adds row grouping at the bottom of the table "anotherTable" with groups "Group A" and "Group B".
+    Adds collapse state and handlers for grouped tables.
     #>
     [CmdletBinding()]
     param(
         [string] $DataTableName,
-        [System.Collections.IDictionary] $Settings,
+        [Array] $Settings,
         [switch] $Top,
         [switch] $Bottom
     )
-    if ($Settings.Count -gt 0) {
-
-        if ($Top) {
-            $Output = "var collapsedGroups = {};"
+    if ($Settings.Count -eq 0) { return }
+    if ($Top) { 'var collapsedGroups = Object.create(null);' }
+    if ($Bottom) {
+        @"
+        function syncGroupedDetails() {
+            table.rows().every(function () {
+                var node = this.node(), child = this.child();
+                if (node && child) { child.toggle(node.style.display !== 'none'); }
+            });
         }
-        if ($Bottom) {
-            $Output = @"
+        table.on('draw.dt responsive-display.dt responsive-resize.dt', syncGroupedDetails);
         `$('#$DataTableName tbody').on('click', 'tr.dtrg-start', function () {
-            var name = `$(this).data('name');
-            collapsedGroups[name] = !collapsedGroups[name];
+            var key = `$(this).attr('data-group-key');
+            collapsedGroups[key] = !collapsedGroups[key];
             table.draw(false);
         });
+        syncGroupedDetails();
 "@
-        }
-        $Output
     }
-}
\ No newline at end of file
+}
diff --git a/Private/Tables/Add-TableState.ps1 b/Private/Tables/Add-TableState.ps1
deleted file mode 100644
index 81867a97..00000000
--- a/Private/Tables/Add-TableState.ps1
+++ /dev/null
@@ -1,85 +0,0 @@
-function Add-TableState {
-    <#
-    .SYNOPSIS
-    Adds table state functionality to a DataTable.
-
-    .DESCRIPTION
-    This function adds table state functionality to a DataTable, allowing for the loading of text input from a saved state.
-
-    .PARAMETER Filtering
-    Specifies whether filtering is enabled.
-
-    .PARAMETER SavedState
-    Specifies whether the saved state is being used.
-
-    .PARAMETER DataTableName
-    The name of the DataTable.
-
-    .PARAMETER FilteringLocation
-    Specifies the location of the filtering (Top, Bottom, Both).
-
-    .EXAMPLE
-    Add-TableState -Filtering $true -SavedState $true -DataTableName "myTable" -FilteringLocation "Top"
-    Adds table state functionality to the DataTable named "myTable" with filtering at the top.
-
-    .EXAMPLE
-    Add-TableState -Filtering $true -SavedState $true -DataTableName "anotherTable" -FilteringLocation "Both"
-    Adds table state functionality to the DataTable named "anotherTable" with filtering at both the top and bottom.
-    #>
-    [CmdletBinding()]
-    param(
-        [bool] $Filtering,
-        [bool] $SavedState,
-        [string] $DataTableName,
-        [ValidateSet('Top', 'Bottom', 'Both')][string]$FilteringLocation = 'Bottom'
-    )
-    if ($Filtering -and $SavedState) {
-        if ($FilteringLocation -eq 'Top') {
-            $Output = @"
-                // Setup - Looading text input from SavedState
-                `$('#$DataTableName').on('stateLoaded.dt', function(e, settings, data) {
-                    settings.aoPreSearchCols.forEach(function(col, index) {
-                        if (col.sSearch) setTimeout(function() {
-                            `$('#$DataTableName thead th:eq('+index+') input').val(col.sSearch)
-                        }, 50)
-                    })
-                });
-"@
-        } elseif ($FilteringLocation -eq 'Both') {
-            $Output = @"
-                // Setup - Looading text input from SavedState
-                `$('#$DataTableName').on('stateLoaded.dt', function(e, settings, data) {
-                    settings.aoPreSearchCols.forEach(function(col, index) {
-                        if (col.sSearch) setTimeout(function() {
-                            `$('#$DataTableName thead th:eq('+index+') input').val(col.sSearch)
-                        }, 50)
-                    })
-                });
-                // Setup - Looading text input from SavedState
-                `$('#$DataTableName').on('stateLoaded.dt', function(e, settings, data) {
-                    settings.aoPreSearchCols.forEach(function(col, index) {
-                        if (col.sSearch) setTimeout(function() {
-                            `$('#$DataTableName tfoot th:eq('+index+') input').val(col.sSearch)
-                        }, 50)
-                    })
-                });
-"@
-
-        } else {
-            $Output = @"
-                // Setup - Looading text input from SavedState
-                `$('#$DataTableName').on('stateLoaded.dt', function(e, settings, data) {
-                    settings.aoPreSearchCols.forEach(function(col, index) {
-                        if (col.sSearch) setTimeout(function() {
-                            `$('#$DataTableName tfoot th:eq('+index+') input').val(col.sSearch)
-                        }, 50)
-                    })
-                })
-"@
-
-        }
-    } else {
-        $Output = ''
-    }
-    return $Output
-}
\ No newline at end of file
diff --git a/Private/Tables/Convert-TableRowGrouping.ps1 b/Private/Tables/Convert-TableRowGrouping.ps1
index 09fe5660..c4382b3c 100644
--- a/Private/Tables/Convert-TableRowGrouping.ps1
+++ b/Private/Tables/Convert-TableRowGrouping.ps1
@@ -1,62 +1,38 @@
 function Convert-TableRowGrouping {
     <#
     .SYNOPSIS
-    Converts a specified row grouping column in a table to a collapsible row group.
-
-    .DESCRIPTION
-    This function converts a specified row grouping column in a table to a collapsible row group. It adds a rowGroup property to the options object with the necessary configuration for the 'row group' plugin.
-
-    .PARAMETER Options
-    The options object containing the table configuration.
-
-    .PARAMETER RowGroupingColumnID
-    The ID of the column to be used for row grouping.
-
-    .EXAMPLE
-    Convert-TableRowGrouping -Options $options -RowGroupingColumnID 2
-    Converts the table to have a collapsible row group using column 2 for grouping.
-
-    .EXAMPLE
-    Convert-TableRowGrouping -Options $options -RowGroupingColumnID 0
-    Converts the table to have a collapsible row group using column 0 for grouping.
+    Configures ordered grouping levels with collapse state scoped to the complete group path.
     #>
     [CmdletBinding()]
     param(
         [string] $Options,
-        [int] $RowGroupingColumnID
+        [int[]] $RowGroupingColumnID,
+        [string[]] $HeaderNames,
+        [string] $DataStore
     )
-    if ($RowGroupingColumnID -gt -1) {
-
-        $TextToReplace = @"
-        rowGroup: {
-            // Uses the 'row group' plugin
-            dataSrc: $RowGroupingColumnID,
-            startRender: function (rows, group) {
-                var collapsed = !!collapsedGroups[group];
-
-                rows.nodes().each(function (r) {
-                    r.style.display = collapsed ? 'none' : '';
-                });
-
-                var toggleClass = collapsed ? 'fa-plus-square' : 'fa-minus-square';
-
-                // Add group name to <tr>
-                return `$('<tr/>')
-                    .append('<td colspan="' + rows.columns()[0].length + '">' + '<span class="fa fa-fw ' + toggleClass + ' toggler"/> ' + group + ' (' + rows.count() + ')</td>')
-                    .attr('data-name', group)
-                    .toggleClass('collapsed', collapsed);
-            },
-        },
+    $Keys = @(foreach ($Index in $RowGroupingColumnID) { if ($DataStore -eq 'HTML') { $Index } else { $HeaderNames[$Index] } })
+    $Columns = ConvertTo-HTMLScriptJson -InputObject $Keys -Compress
+    $DataSources = ConvertTo-HTMLScriptJson -InputObject @(foreach ($Key in $Keys) { if ($Key -is [string]) { $Key.Replace('.', '\.') } else { $Key } }) -Compress
+    $Renderer = @"
+    "rowGroup": {dataSrc: $DataSources, startRender: function (rows, group, level) {
+        var columns = $Columns;
+        var first = rows.data()[0];
+        var path = columns.slice(0, level + 1).map(function (column) { return first[column]; });
+        var key = JSON.stringify(path);
+        var parentCollapsed = path.some(function (value, index) {
+            return index < level && !!collapsedGroups[JSON.stringify(path.slice(0, index + 1))];
+        });
+        var collapsed = !!collapsedGroups[key];
+        rows.nodes().each(function (row) { row.style.display = parentCollapsed || collapsed ? 'none' : ''; });
+        if (parentCollapsed) { return null; }
+        var count = rows.columns().visible().toArray().filter(function (visible) { return visible; }).length;
+        var toggle = `$('<button/>', {type: 'button', 'aria-expanded': !collapsed})
+            .css({background: 'none', border: 'none', color: 'inherit', font: 'inherit', cursor: 'pointer'})
+            .append(`$('<span/>', {'aria-hidden': 'true'}).text(collapsed ? '+' : '\u2212'))
+            .append(document.createTextNode(' ' + `$('<div/>').html(group).text() + ' (' + rows.count() + ')'));
+        return `$('<tr/>').append(`$('<td/>', {colspan: count}).append(toggle))
+            .attr('data-group-key', key).toggleClass('collapsed', collapsed);
+    }}
 "@
-    } else {
-        $TextToReplace = ''
-    }
-    if ($PSEdition -eq 'Desktop') {
-        $TextToFind = '"rowGroup":  "",'
-    } else {
-        $TextToFind = '"rowGroup": "",'
-    }
-    # $TextToFind = '"rowGroup":"",' # this is a workaround for ConvertTo-JsonLiteral
-    $Options = $Options -Replace ($TextToFind, $TextToReplace)
-    $Options
-}
\ No newline at end of file
+    [regex]::Replace($Options, '"rowGroup"\s*:\s*""', [System.Text.RegularExpressions.MatchEvaluator]{ param($Match) $Renderer })
+}
diff --git a/Private/Tables/Get-TableExportScript.ps1 b/Private/Tables/Get-TableExportScript.ps1
new file mode 100644
index 00000000..13f49001
--- /dev/null
+++ b/Private/Tables/Get-TableExportScript.ps1
@@ -0,0 +1,27 @@
+function Get-TableExportScript {
+    <#
+    .SYNOPSIS
+    Adds PSWriteHTML export policy to the existing Buttons configurations.
+    #>
+    [CmdletBinding()]
+    param(
+        [System.Collections.IDictionary] $Options,
+        [string] $ExportScope
+    )
+    $Replacements = @{}
+    for ($Index = 0; $Index -lt $Options.buttons.Count; $Index++) {
+        $Button = $Options.buttons[$Index]
+        if ($Button.extend -notin 'excelHtml5', 'csvHtml5', 'copyHtml5', 'pdfHtml5', 'print') { continue }
+        # Excel's old numeric conversion is replaced by the shared export policy.
+        if ($Button.exportOptions -and $Button.exportOptions.format -eq 'findExportOptions') { $Button.exportOptions.Remove('format') }
+        $Json = ConvertTo-HTMLScriptJson -InputObject $Button -Depth 8 -Compress
+        $ScopeJson = ConvertTo-HTMLScriptJson -InputObject $ExportScope -Compress
+        $Marker = "pswhExportButton$Index"
+        $Replacements[$Marker] = "pswhConfigureExport($Json, $ScopeJson)"
+        $Options.buttons[$Index] = $Marker
+    }
+    if ($Replacements.Count -gt 0) {
+        $Script:HTMLSchema.CustomFooterJS['PSWriteHTMLExportPolicy'] = [IO.File]::ReadAllText((Join-Path $MyInvocation.MyCommand.Module.ModuleBase 'Resources/JS/pswritehtml-table-export.js'))
+    }
+    return $Replacements
+}
diff --git a/Private/Tables/Get-TableInlineStyles.ps1 b/Private/Tables/Get-TableInlineStyles.ps1
new file mode 100644
index 00000000..ce1eb1ae
--- /dev/null
+++ b/Private/Tables/Get-TableInlineStyles.ps1
@@ -0,0 +1,62 @@
+function Get-TableInlineStyles {
+    <#
+    .SYNOPSIS
+    Evaluates inline conditions against complete source rows and styles visible cells.
+    #>
+    [CmdletBinding()]
+    param(
+        [Array] $Table,
+        [string[]] $HeaderNames,
+        [Array] $SourceRows,
+        [System.Collections.Generic.List[PSCustomObject]] $Conditions
+    )
+    if ($Conditions.Count -eq 0) { return }
+    $HeaderNames = @($HeaderNames | ForEach-Object { [Net.WebUtility]::HtmlDecode($_) })
+    for ($RowIndex = 1; $RowIndex -lt $Table.Count; $RowIndex++) {
+        $ConditionHeaders = $HeaderNames
+        [Array] $Values = ($Table[$RowIndex] -replace '</td></tr>' -replace '<tr><td>' -split '</td><td>') | ForEach-Object { [System.Net.WebUtility]::HtmlDecode($_) }
+        if ($SourceRows -and $SourceRows.Count -ge $RowIndex -and $SourceRows[$RowIndex - 1] -isnot [string] -and $SourceRows[$RowIndex - 1] -isnot [ValueType]) {
+            $Source = $SourceRows[$RowIndex - 1]
+            $ConditionHeaders = @($Source.PSObject.Properties.Name)
+            $RenderedValues = $Values
+            $Values = @(foreach ($Name in $ConditionHeaders) {
+                $VisibleIndex = [array]::IndexOf($HeaderNames.ToUpper(), $Name.ToUpper())
+                if ($VisibleIndex -ge 0 -and $Source.$Name -isnot [DateTime]) { , $RenderedValues[$VisibleIndex] } else { , $Source.$Name }
+            })
+        }
+        foreach ($Condition in $Conditions) {
+            $Rules = if ($Condition.ConditionType -eq 'Condition') { @($Condition) } else { @($Condition.Conditions.Output) }
+            $Matches = @(foreach ($Rule in $Rules) {
+                $Index = [array]::IndexOf($ConditionHeaders.ToUpper(), $Rule.Name.ToUpper())
+                if ($Index -ge 0) {
+                    New-TableConditionalFormattingInline -RowData $Values -ColumnCount $Index -ConditionalFormatting $Rule
+                } else {
+                    $false
+                }
+            })
+            $Pass = if ($Condition.ConditionType -eq 'Condition') {
+                $Matches[0]
+            } elseif ($Condition.Logic -eq 'OR') {
+                $Matches -contains $true
+            } elseif ($Condition.Logic -eq 'NONE') {
+                $Matches.Count -gt 0 -and $Matches -notcontains $true
+            } else {
+                $Matches.Count -gt 0 -and $Matches -notcontains $false
+            }
+            $Style = if ($Pass) { $Condition.Style } else { $Condition.FailStyle }
+            if (-not $Style -or $Style.Count -eq 0) { continue }
+            $Targets = if ($Condition.Row) {
+                0..($HeaderNames.Count - 1)
+            } elseif ($Condition.HighlightHeaders) {
+                foreach ($Name in $Condition.HighlightHeaders) { [array]::IndexOf($HeaderNames.ToUpper(), $Name.ToUpper()) }
+            } else {
+                [array]::IndexOf($HeaderNames.ToUpper(), $Condition.Name.ToUpper())
+            }
+            foreach ($Target in $Targets) {
+                if ($Target -ge 0) {
+                    [PSCustomObject]@{ RowIndex = $RowIndex; ColumnIndex = $Target + 1; Style = $Style }
+                }
+            }
+        }
+    }
+}
diff --git a/Private/Tables/New-TableConditionalFormattingInline.ps1 b/Private/Tables/New-TableConditionalFormattingInline.ps1
index a1eb1345..d73cf488 100644
--- a/Private/Tables/New-TableConditionalFormattingInline.ps1
+++ b/Private/Tables/New-TableConditionalFormattingInline.ps1
@@ -79,7 +79,9 @@
         }
     } elseif ($ConditionalFormatting.Type -eq 'date') {
         try {
-            if ($ConditionalFormatting.DateTimeFormat) {
+            if ($RowData[$ColumnCount] -is [DateTime]) {
+                $SideLeft = $RowData[$ColumnCount]
+            } elseif ($ConditionalFormatting.DateTimeFormat) {
                 $SideLeft = [DateTime]::ParseExact($RowData[$ColumnCount], $ConditionalFormatting.DateTimeFormat, $null)
             } else {
                 $SideLeft = [DateTime]::Parse($RowData[$ColumnCount])
@@ -124,4 +126,4 @@
         $Pass = $SideLeft -gt $SideRight[0] -and $SideLeft -lt $SideRight[1]
     }
     $Pass
-}
\ No newline at end of file
+}
diff --git a/Private/Tables/Set-TableButtons.ps1 b/Private/Tables/Set-TableButtons.ps1
new file mode 100644
index 00000000..5507c1c2
--- /dev/null
+++ b/Private/Tables/Set-TableButtons.ps1
@@ -0,0 +1,144 @@
+function Set-TableButtons {
+    <#
+    .SYNOPSIS
+    Builds the configured table buttons and enables only their required assets.
+    #>
+    [CmdletBinding()]
+    param(
+        [System.Collections.IDictionary] $Options,
+        [Array] $CustomButtons,
+        [string[]] $Buttons,
+        [string] $Title,
+        [switch] $HideButtons,
+        [switch] $DisablePaging,
+        [switch] $ScrollY,
+        [string] $ToggleViewDefaultViewMode
+    )
+    if (-not $Script:HTMLSchema['TableSimplify'] -and -not $HideButtons) {
+        $Script:HTMLSchema.Features.DataTablesButtons = $true
+        $Options['buttons'] = @(
+            if ($CustomButtons) {
+                foreach ($Button in $CustomButtons) {
+                    if (-not $Button.Title -and $Title) {
+                        $Button.title = $Title
+                    }
+                    if ($Button.extend -eq 'searchBuilder' -and $Button.text) {
+                        if (-not $Options.Contains('language') -or -not $Options['language']) {
+                            $Options['language'] = [ordered]@{}
+                        }
+                        if (-not $Options['language'].Contains('searchBuilder') -or -not $Options['language']['searchBuilder']) {
+                            $Options['language']['searchBuilder'] = [ordered]@{}
+                        }
+                        $Options['language']['searchBuilder']['button'] = $Button.text
+                    }
+                    $Button
+                }
+            } else {
+                foreach ($button in $Buttons) {
+                    if ($button -eq 'pdfHtml5') {
+                        $ButtonOutput = [ordered] @{
+                            extend      = 'pdfHtml5'
+                            pageSize    = 'A3'
+                            orientation = 'landscape'
+                            title       = $Title
+                        }
+                        $Script:HTMLSchema.Features.DataTablesButtonsPDF = $true
+                    } elseif ($button -eq 'pageLength') {
+                        if (-not $DisablePaging -and -not $ScrollY) {
+                            $ButtonOutput = @{
+                                extend = $button
+                            }
+                        } else {
+                            $ButtonOutput = $null
+                        }
+                    } elseif ($button -eq 'excelHtml5') {
+                        $Script:HTMLSchema.Features.DataTablesButtonsHTML5 = $true
+                        $Script:HTMLSchema.Features.DataTablesButtonsExcel = $true
+                        $ButtonOutput = [ordered] @{
+                            extend        = $button
+                            title         = $Title
+                            exportOptions = @{
+                                #columns = 'visible'
+                                format = "findExportOptions"
+                            }
+                        }
+                    } elseif ($button -eq 'copyHtml5') {
+                        $Script:HTMLSchema.Features.DataTablesButtonsHTML5 = $true
+                        $ButtonOutput = [ordered] @{
+                            extend = $button
+                            title  = $Title
+                        }
+                    } elseif ($button -eq 'csvHtml5') {
+                        $Script:HTMLSchema.Features.DataTablesButtonsHTML5 = $true
+                        $ButtonOutput = [ordered] @{
+                            extend         = $button
+                            title          = $Title
+                            text           = 'CSV'
+                            charset        = 'utf-8'
+                            extension      = '.csv'
+                            fieldSeparator = ';'
+                            fieldBoundary  = '"'
+                            #filename       = 'export'
+                            bom            = $true
+                        }
+                    } elseif ($button -eq 'searchPanes') {
+                        $Script:HTMLSchema.Features.DataTablesSearchPanes = $true
+                        $ButtonOutput = [ordered] @{
+                            extend = $button
+                            title  = $Title
+                        }
+                    } elseif ($button -eq 'print') {
+                        $Script:HTMLSchema.Features.DataTablesButtonsPrint = $true
+                        $ButtonOutput = [ordered] @{
+                            extend = $button
+                            title  = $Title
+                        }
+                    } elseif ($button -eq 'searchBuilder') {
+                        $Script:HTMLSchema.Features.DataTablesDateTime = $true
+                        $Script:HTMLSchema.Features.DataTablesSearchBuilder = $true
+                        $ButtonOutput = [ordered] @{
+                            extend = $button
+                            title  = $Title
+                            #config = @{
+                            #depthLimit = 2
+                            #}
+                        }
+                    } elseif ($button -eq 'columnVisibility') {
+                        $Script:HTMLSchema.Features.DataTablesButtonsColVis = $true
+                        $Script:HTMLSchema.Features.DataTablesButtonsColVis = $true
+                        $ButtonOutput = [ordered] @{
+                            extend           = 'colvis'
+                            title            = $Title
+                            collectionLayout = 'dropdown columns'
+                            collectionTitle  = 'Visibility control'
+                        }
+                    } elseif ($button -eq 'toggleView') {
+                        # Set initial button text based on starting mode
+                        if ($ToggleViewDefaultViewMode -eq 'scrollx') {
+                            $ButtonText = 'Switch to Responsive'
+                        } else {
+                            $ButtonText = 'Switch to ScrollX'
+                        }
+                        $ButtonOutput = [ordered] @{
+                            extend          = 'toggleView'
+                            title           = $Title
+                            text            = $ButtonText
+                            defaultViewMode = $ToggleViewDefaultViewMode
+                        }
+                    } else {
+                        $ButtonOutput = [ordered] @{
+                            extend = $button
+                            title  = $Title
+                        }
+                    }
+                    if ($ButtonOutput) {
+                        Remove-EmptyValue -Hashtable $ButtonOutput
+                        $ButtonOutput
+                    }
+                }
+            }
+        )
+    } else {
+        $Options['buttons'] = @()
+    }
+}
diff --git a/Public/New-HTMLCalendar.ps1 b/Public/New-HTMLCalendar.ps1
index 36ccd3e7..48ca363c 100644
--- a/Public/New-HTMLCalendar.ps1
+++ b/Public/New-HTMLCalendar.ps1
@@ -188,7 +188,7 @@
     $Calendar['eventClick'] = 'eventClickReplaceMe'
 
     Remove-EmptyValue -Hashtable $Calendar -Recursive
-    $CalendarJSON = $Calendar | ConvertTo-Json -Depth 7
+    $CalendarJSON = $Calendar | ConvertTo-HTMLScriptJson -Depth 7
 
     # Adding function for ToolTips / need cleaner way
     $eventDidMount = @"
diff --git a/Public/New-HTMLCarousel.ps1 b/Public/New-HTMLCarousel.ps1
index 84bae03f..cf9b012e 100644
--- a/Public/New-HTMLCarousel.ps1
+++ b/Public/New-HTMLCarousel.ps1
@@ -198,7 +198,7 @@
     }
 
     Remove-EmptyValue -Hashtable $Options
-    $Carousel = $Options | ConvertTo-JsonLiteral -Depth 1 -AdvancedReplace @{ '.' = '\.'; '$' = '\$' }
+    $Carousel = $Options | ConvertTo-JsonLiteral -Depth 1 -AdvancedReplace @{ '.' = '\.'; '$' = '\$' } | Protect-HTMLScriptData
 
     New-HTMLTag -Tag 'div' -Attributes @{ ID = $CarouselID; class = "carousel" } {
         if ($Slide) {
diff --git a/Public/New-HTMLDiagram.ps1 b/Public/New-HTMLDiagram.ps1
index 048e0deb..1c3f112f 100644
--- a/Public/New-HTMLDiagram.ps1
+++ b/Public/New-HTMLDiagram.ps1
@@ -1,4 +1,4 @@
-function New-HTMLDiagram {
+function New-HTMLDiagram {
     <#
     .SYNOPSIS
     Creates a new HTML diagram with customizable options.
@@ -167,10 +167,10 @@ function New-HTMLDiagram {
         foreach ($R in $Replace.Keys) {
             $NodeJson = $NodeJson.Replace($R, $Replace[$R])
         }
-        $NodeJson
+        Protect-HTMLScriptData -Json $NodeJson
     }
     [Array] $Edges = foreach ($_ in $DataEdges) {
-        $_ | ConvertTo-JsonLiteral -Depth 5 -AdvancedReplace @{ '.' = '\.'; '$' = '\$' } #| ForEach-Object { [System.Text.RegularExpressions.Regex]::Unescape($_) }
+        $_ | ConvertTo-JsonLiteral -Depth 5 -AdvancedReplace @{ '.' = '\.'; '$' = '\$' } | Protect-HTMLScriptData
     }
 
     $Options = @{
diff --git a/Public/New-HTMLGage.ps1 b/Public/New-HTMLGage.ps1
index 6556a970..ae1d1f77 100644
--- a/Public/New-HTMLGage.ps1
+++ b/Public/New-HTMLGage.ps1
@@ -418,7 +418,7 @@
     $Script = New-HTMLTag -Tag 'script' -Value {
         # Convert Dictionary to JSON and return chart within SCRIPT tag
         # Make sure to return with additional empty string
-        $JSON = $Gage | ConvertTo-Json -Depth 5 | ForEach-Object { [System.Text.RegularExpressions.Regex]::Unescape($_) }
+        $JSON = $Gage | ConvertTo-HTMLScriptJson -Depth 20
         "document.addEventListener(`"DOMContentLoaded`", function (event) {"
         "var g1 = new JustGage( $JSON );"
         "});"
@@ -515,4 +515,4 @@ customSectors: {
     hi : 100
   }]
 }
-#>
\ No newline at end of file
+#>
diff --git a/Public/New-HTMLMap.ps1 b/Public/New-HTMLMap.ps1
index 02301d61..c5a8c9b1 100644
--- a/Public/New-HTMLMap.ps1
+++ b/Public/New-HTMLMap.ps1
@@ -130,7 +130,7 @@
 
     Remove-EmptyValue -Hashtable $Options -Recursive -Rerun 2
 
-    $OptionsJSON = $Options | ConvertTo-JsonLiteral -Depth 5 -AdvancedReplace @{ '.' = '\.'; '$' = '\$' }
+    $OptionsJSON = $Options | ConvertTo-JsonLiteral -Depth 5 -AdvancedReplace @{ '.' = '\.'; '$' = '\$' } | Protect-HTMLScriptData
 
     New-HTMLTag -Tag 'script' {
         "`$(function () { `$(`".$AnchorName`").mapael($OptionsJSON); });"
diff --git a/Public/New-HTMLMarkdown.ps1 b/Public/New-HTMLMarkdown.ps1
index 2959d382..b2bc73e0 100644
--- a/Public/New-HTMLMarkdown.ps1
+++ b/Public/New-HTMLMarkdown.ps1
@@ -69,6 +69,12 @@
     .PARAMETER Encoding
     Specifies the encoding for reading the Markdown content file. Default is 'UTF8'.
 
+    .PARAMETER ImageBase
+    Base directory for relative image files. Defaults to the Markdown file's directory. Files outside this directory and symbolic links are not embedded.
+
+    .PARAMETER EmbedImages
+    Embeds local images when reading a file or using ImageBase. Defaults to true. Set to false to retain relative image references.
+
     .EXAMPLE
     New-HTMLMarkdown -FilePath "C:\Markdown\example.md" -EnableStrikethrough -EnableEmoji -EnableTOC
 
@@ -103,7 +109,9 @@
         [switch] $EnableBackslashEscapes,
         [switch] $SanitezeHTML,
         [switch] $EnableTOC,
-        [string] $Encoding = 'UTF8'
+        [string] $Encoding = 'UTF8',
+        [string] $ImageBase,
+        [bool] $EmbedImages = $true
     )
 
     $Script:HTMLSchema.Features.MarkdownShowdown = $true
@@ -123,12 +131,11 @@
         $Id = "MarkdownContainer$(Get-RandomStringName -Size 8)"
     }
 
-    #$CodeBlock = $false
-    $Var = foreach ($C in $Content) {
-        $Value = $C.Replace("'", "\'")
-        $Value + "\n"
+    $JoinedContent = [string]::Join("`n", [string[]]$Content) + "`n"
+    if ($EmbedImages -and ($FilePath -or $ImageBase)) {
+        if (-not $ImageBase) { $ImageBase = Split-Path -Parent (Convert-Path -LiteralPath $FilePath) }
+        $JoinedContent = Resolve-HTMLMarkdownImages -Content $JoinedContent -ImageBase $ImageBase
     }
-    $JoinedContent = $Var -join ''
     if ($EnableTOC) {
         $JoinedContent = $JoinedContent.Replace('[TOC]', '[toc]')
         $JoinedContent = $JoinedContent.Replace('[toc]', '<p>[toc]</p>')
@@ -188,15 +195,17 @@
         $Options['extensions'] = @('tocReplaceMe')
     }
 
-    $OptionsJSON = $Options | ConvertTo-Json
+    $ContentJSON = ConvertTo-HTMLScriptJson -InputObject $JoinedContent -Compress
+    $IdJSON = ConvertTo-HTMLScriptJson -InputObject $Id -Compress
+    $OptionsJSON = $Options | ConvertTo-HTMLScriptJson
     $OptionsJSON = $OptionsJSON -replace '"tocReplaceMe"', 'showdownToc()'
 
     New-HTMLPanel -Invisible {
         New-HTMLTag -Tag 'div' -Attributes @{ class = 'markdown-body'; id = $Id } {}
 
         $Script = New-HTMLTag -Tag 'script' -Value {
-            "let $TextVariable = '$JoinedContent';"
-            "const $VariableOutput = document.getElementById(`"$Id`");"
+            "let $TextVariable = $ContentJSON;"
+            "const $VariableOutput = document.getElementById($IdJSON);"
             "var $ConverterVariable = new showdown.Converter($OptionsJSON),"
             "$HtmlVariable = $ConverterVariable.makeHtml($TextVariable);"
 
@@ -234,4 +243,4 @@
         output.innerHTML = `<h3>${initText}</h3>`;
     }
 </script>
-#>
\ No newline at end of file
+#>
diff --git a/Public/New-HTMLOrgChart.ps1 b/Public/New-HTMLOrgChart.ps1
index be71ac54..ead7cf1b 100644
--- a/Public/New-HTMLOrgChart.ps1
+++ b/Public/New-HTMLOrgChart.ps1
@@ -155,7 +155,7 @@
             $OrgChart['zoomoutLimit'] = $ZoomOutLimit
         }
     }
-    $JsonOrgChart = $OrgChart | ConvertTo-Json -Depth 100
+    $JsonOrgChart = $OrgChart | ConvertTo-HTMLScriptJson -Depth 100
 
     New-HTMLTag -Tag 'script' {
         "`$(function () {"
diff --git a/Public/New-HTMLQRCode.ps1 b/Public/New-HTMLQRCode.ps1
index 8aa91fdf..f8adb18f 100644
--- a/Public/New-HTMLQRCode.ps1
+++ b/Public/New-HTMLQRCode.ps1
@@ -1,4 +1,4 @@
-function New-HTMLQRCode {
+function New-HTMLQRCode {
     <#
     .SYNOPSIS
     Creates an HTML QR code with specified parameters.
@@ -81,7 +81,7 @@ function New-HTMLQRCode {
         titleColor = ConvertFrom-Color -Color $TitleColor
     }
     Remove-EmptyValue -Hashtable $Options -Recursive
-    $OptionsJson = $Options | ConvertTo-Json
+    $OptionsJson = $Options | ConvertTo-HTMLScriptJson
 
     # Since we want to allow use of QR code in tables or other places we push it to footer instead of inline
     $ScriptBottom = New-HTMLTag -Tag 'script' -Value {
diff --git a/Public/New-HTMLTab.ps1 b/Public/New-HTMLTab.ps1
index 354026dd..59e5b636 100644
--- a/Public/New-HTMLTab.ps1
+++ b/Public/New-HTMLTab.ps1
@@ -1,4 +1,4 @@
-function New-HTMLTab {
+function New-HTMLTab {
     <#
     .SYNOPSIS
     Creates a new HTML tab with customizable content and icons.
@@ -193,6 +193,7 @@ function New-HTMLTab {
 
 
         $Script:HTMLSchema.Features.Tabbis = $true
+        $Script:HTMLSchema.CustomFooterJS['PSWriteHTMLTabNavigation'] = [IO.File]::ReadAllText((Join-Path $MyInvocation.MyCommand.Module.ModuleBase 'Resources/JS/tabbisNavigation.js'))
         $Script:HTMLSchema.Features.RedrawObjects = $true
         #New-HTMLTag -Tag 'div' -Attributes @{ id = $Tab.ID; class = $Class } {
         New-HTMLTag -Tag 'div' -Attributes @{ id = "$($Tab.ID)-Content"; class = $Class } {
@@ -224,8 +225,8 @@ function New-HTMLTab {
                 $HTML
             }
             if ($Default) {
-                $TabIDJson = $Tab.ID | ConvertTo-Json -Compress
-                $PaneIDJson = "$($Tab.ID)-Content" | ConvertTo-Json -Compress
+                $TabIDJson = $Tab.ID | ConvertTo-HTMLScriptJson -Compress
+                $PaneIDJson = "$($Tab.ID)-Content" | ConvertTo-HTMLScriptJson -Compress
                 New-HTMLTag -Tag 'script' {
                     @"
 document.addEventListener('DOMContentLoaded', function () {
diff --git a/Public/New-HTMLTabPanel.ps1 b/Public/New-HTMLTabPanel.ps1
index 7449f4fe..4a57a506 100644
--- a/Public/New-HTMLTabPanel.ps1
+++ b/Public/New-HTMLTabPanel.ps1
@@ -127,7 +127,7 @@
                 }
             }
             Remove-EmptyValue -Hashtable $SmartTab
-            $SmartTabConfiguration = $SmartTab | ConvertTo-Json -Depth 2
+            $SmartTabConfiguration = $SmartTab | ConvertTo-HTMLScriptJson -Depth 2
 
             New-HTMLTag -Tag 'script' {
                 @"
diff --git a/Public/New-HTMLTable.ps1 b/Public/New-HTMLTable.ps1
index 476f4481..2322dcd4 100644
--- a/Public/New-HTMLTable.ps1
+++ b/Public/New-HTMLTable.ps1
@@ -204,6 +204,12 @@
     .PARAMETER SearchPane
     Enables search pane in the table.
 
+    .PARAMETER SearchPaneColumns
+    Column names to include in search panes when SearchPane or its button is enabled.
+
+    .PARAMETER ExportScope
+    Controls rows exported by table buttons. Automatic keeps DataTables selection and filtering behavior. All exports every row, Filtered exports matching rows regardless of selection, and Selected exports only selected matching rows.
+
     .PARAMETER SearchPaneLocation
     Specifies the location of the search pane.
 
@@ -345,6 +351,8 @@
         [switch] $AutoSize,
         [switch] $DisableAutoWidthOptimization,
         [switch] $SearchPane,
+        [string[]] $SearchPaneColumns,
+        [ValidateSet('Automatic', 'All', 'Filtered', 'Selected')][string] $ExportScope = 'Automatic',
         [ValidateSet('top', 'bottom')][string] $SearchPaneLocation = 'top',
         [switch] $SearchBuilder,
         [ValidateSet('top', 'bottom')][string] $SearchBuilderLocation = 'top',
@@ -428,7 +436,7 @@
 
     # This will be used to store the colulmnDef option for the datatable
     $ColumnDefinitionList = [System.Collections.Generic.List[PSCustomObject]]::New()
-    $RowGrouping = @{ }
+    $RowGrouping = [System.Collections.Generic.List[System.Collections.IDictionary]]::new()
 
     # This adds support for table of data provided as an array of arrays
     # Useful if you have Hashtable with nested arrays and you do $Hashtable.Values
@@ -505,6 +513,9 @@
                     $ConditionalFormatting.Add($Parameters.Output)
                 } elseif ($Parameters.Type -eq 'TableHeaderMerge') {
                     $HeaderRows.Add($Parameters.Output)
+                    if ($Parameters.Output.NamesStyle.Count -gt 0) {
+                        $HeaderStyle.Add([PSCustomObject]@{ Names = $Parameters.Output.Names; Style = $Parameters.Output.NamesStyle })
+                    }
                 } elseif ($Parameters.Type -eq 'TableHeaderStyle') {
                     $HeaderStyle.Add($Parameters.Output)
                 } elseif ($Parameters.Type -eq 'TableHeaderFullRow') {
@@ -524,7 +535,7 @@
                 } elseif ($Parameters.Type -eq 'TableReplaceCompare') {
                     $ReplaceCompare.Add($Parameters.Output)
                 } elseif ($Parameters.Type -eq 'TableRowGrouping') {
-                    $RowGrouping = $Parameters.Output
+                    $RowGrouping.Add($Parameters.Output)
                 } elseif ($Parameters.Type -eq 'TableColumnOption') {
                     $TableColumnOptions.Add($Parameters.Output)
                 } elseif ($Parameters.Type -eq 'TableEvent') {
@@ -624,6 +635,9 @@
         }
     }
 
+    # Keep helper fields available to inline conditions before projecting visible columns.
+    $ConditionSourceRows = if (-not $Transpose -and $DataTable[0] -isnot [System.Collections.IDictionary]) { @($DataTable) } else { $null }
+
     # we don't do anything for dictionaries, as dictionaries are displayed in two columns approach
     if ($DataTable[0] -isnot [System.Collections.IDictionary]) {
         if ($AllProperties) {
@@ -856,7 +870,7 @@
         [Array] $Table = $DataTable | ForEach-Object { [PSCustomObject]@{ 'Name' = $_ } }
         $ObjectProperties = 'Name'
     } else {
-        [Array] $Table = $DataTable
+        [Array] $Table = $DataTable | Select-Object -Property *
         $ObjectProperties = $DataTable[0].PSObject.Properties.Name
     }
 
@@ -889,7 +903,7 @@
         # It basically goes thru every single row and checks if values to add styles or inline conditional formatting
         # It's heavier then JS, so use when nessecary
         if ($ContentRows.Capacity -gt 0 -or $ContentStyle.Count -gt 0 -or $ContentTop.Count -gt 0 -or $ConditionalFormattingInline.Count -gt 0) {
-            $Table = Add-TableContent -ContentRows $ContentRows -ContentStyle $ContentStyle -ContentTop $ContentTop -ContentFormattingInline $ConditionalFormattingInline -Table $Table -HeaderNames $HeaderNames
+            $Table = Add-TableContent -ContentRows $ContentRows -ContentStyle $ContentStyle -ContentTop $ContentTop -ContentFormattingInline $ConditionalFormattingInline -Table $Table -HeaderNames $HeaderNames -SourceRows $ConditionSourceRows
         }
         $Table = $Table | Select-Object -Skip 1 # this gets actuall table content
     } elseif ($DataStore -eq 'AjaxJSON') {
@@ -940,133 +954,7 @@
         }
     }
 
-    if (-not $Script:HTMLSchema['TableSimplify'] -and -not $HideButtons) {
-        $Script:HTMLSchema.Features.DataTablesButtons = $true
-        $Options['buttons'] = @(
-            if ($CustomButtons) {
-                foreach ($Button in $CustomButtons) {
-                    if (-not $Button.Title -and $Title) {
-                        $Button.title = $Title
-                    }
-                    if ($Button.extend -eq 'searchBuilder' -and $Button.text) {
-                        if (-not $Options.Contains('language') -or -not $Options['language']) {
-                            $Options['language'] = [ordered]@{}
-                        }
-                        if (-not $Options['language'].Contains('searchBuilder') -or -not $Options['language']['searchBuilder']) {
-                            $Options['language']['searchBuilder'] = [ordered]@{}
-                        }
-                        $Options['language']['searchBuilder']['button'] = $Button.text
-                    }
-                    $Button
-                }
-            } else {
-                foreach ($button in $Buttons) {
-                    if ($button -eq 'pdfHtml5') {
-                        $ButtonOutput = [ordered] @{
-                            extend      = 'pdfHtml5'
-                            pageSize    = 'A3'
-                            orientation = 'landscape'
-                            title       = $Title
-                        }
-                        $Script:HTMLSchema.Features.DataTablesButtonsPDF = $true
-                    } elseif ($button -eq 'pageLength') {
-                        if (-not $DisablePaging -and -not $ScrollY) {
-                            $ButtonOutput = @{
-                                extend = $button
-                            }
-                        } else {
-                            $ButtonOutput = $null
-                        }
-                    } elseif ($button -eq 'excelHtml5') {
-                        $Script:HTMLSchema.Features.DataTablesButtonsHTML5 = $true
-                        $Script:HTMLSchema.Features.DataTablesButtonsExcel = $true
-                        $ButtonOutput = [ordered] @{
-                            extend        = $button
-                            title         = $Title
-                            exportOptions = @{
-                                #columns = 'visible'
-                                format = "findExportOptions"
-                            }
-                        }
-                    } elseif ($button -eq 'copyHtml5') {
-                        $Script:HTMLSchema.Features.DataTablesButtonsHTML5 = $true
-                        $ButtonOutput = [ordered] @{
-                            extend = $button
-                            title  = $Title
-                        }
-                    } elseif ($button -eq 'csvHtml5') {
-                        $Script:HTMLSchema.Features.DataTablesButtonsHTML5 = $true
-                        $ButtonOutput = [ordered] @{
-                            extend         = $button
-                            title          = $Title
-                            text           = 'CSV'
-                            charset        = 'utf-8'
-                            extension      = '.csv'
-                            fieldSeparator = ';'
-                            fieldBoundary  = ''
-                            #filename       = 'export'
-                            bom            = $true
-                        }
-                    } elseif ($button -eq 'searchPanes') {
-                        $Script:HTMLSchema.Features.DataTablesSearchPanes = $true
-                        $ButtonOutput = [ordered] @{
-                            extend = $button
-                            title  = $Title
-                        }
-                    } elseif ($button -eq 'print') {
-                        $Script:HTMLSchema.Features.DataTablesButtonsPrint = $true
-                        $ButtonOutput = [ordered] @{
-                            extend = $button
-                            title  = $Title
-                        }
-                    } elseif ($button -eq 'searchBuilder') {
-                        $Script:HTMLSchema.Features.DataTablesDateTime = $true
-                        $Script:HTMLSchema.Features.DataTablesSearchBuilder = $true
-                        $ButtonOutput = [ordered] @{
-                            extend = $button
-                            title  = $Title
-                            #config = @{
-                            #depthLimit = 2
-                            #}
-                        }
-                    } elseif ($button -eq 'columnVisibility') {
-                        $Script:HTMLSchema.Features.DataTablesButtonsColVis = $true
-                        $Script:HTMLSchema.Features.DataTablesButtonsColVis = $true
-                        $ButtonOutput = [ordered] @{
-                            extend           = 'colvis'
-                            title            = $Title
-                            collectionLayout = 'dropdown columns'
-                            collectionTitle  = 'Visibility control'
-                        }
-                    } elseif ($button -eq 'toggleView') {
-                        # Set initial button text based on starting mode
-                        if ($ToggleViewDefaultViewMode -eq 'scrollx') {
-                            $ButtonText = 'Switch to Responsive'
-                        } else {
-                            $ButtonText = 'Switch to ScrollX'
-                        }
-                        $ButtonOutput = [ordered] @{
-                            extend          = 'toggleView'
-                            title           = $Title
-                            text            = $ButtonText
-                            defaultViewMode = $ToggleViewDefaultViewMode
-                        }
-                    } else {
-                        $ButtonOutput = [ordered] @{
-                            extend = $button
-                            title  = $Title
-                        }
-                    }
-                    if ($ButtonOutput) {
-                        Remove-EmptyValue -Hashtable $ButtonOutput
-                        $ButtonOutput
-                    }
-                }
-            }
-        )
-    } else {
-        $Options['buttons'] = @()
-    }
+    Set-TableButtons -Options $Options -CustomButtons $CustomButtons -Buttons $Buttons -Title $Title -HideButtons:$HideButtons -DisablePaging:$DisablePaging -ScrollY:([bool]$ScrollY) -ToggleViewDefaultViewMode $ToggleViewDefaultViewMode
     if ($ScrollX) {
         $Options.'scrollX' = $true
         # We don't disable responsive table if toggleView is requested
@@ -1159,20 +1047,22 @@
         }
     }
 
-    [int] $RowGroupingColumnID = -1
+    $RowGroupingColumns = [System.Collections.Generic.List[int]]::new()
     if ($RowGrouping.Count -gt 0) {
-        if ($RowGrouping.Name) {
-            $RowGroupingColumnID = ($HeaderNames).ToLower().IndexOf($RowGrouping.Name.ToLower())
-        } else {
-            $RowGroupingColumnID = $RowGrouping.ColumnID
-        }
-        if ($RowGroupingColumnID -ne -1) {
-            $ColumnsOrder = , @($RowGroupingColumnID, $RowGrouping.Sorting)
-            if ($DefaultSortColumn.Count -gt 0 -or $DefaultSortIndex.Count -gt 0) {
-                Write-Warning 'New-HTMLTable - Row grouping sorting overwrites default sorting.'
+        $ColumnsOrder = @(foreach ($Grouping in $RowGrouping) {
+            $ColumnID = if ($Grouping.Name) { [array]::IndexOf($HeaderNames.ToLower(), $Grouping.Name.ToLower()) } else { $Grouping.ColumnID }
+            if ($ColumnID -ge 0 -and $ColumnID -lt $HeaderNames.Count) {
+                $RowGroupingColumns.Add($ColumnID)
+                if ($Grouping.HideColumn) {
+                    $ColumnDefinitionList.Add([PSCustomObject]@{ targets = $ColumnID; visible = $false; searchable = $true })
+                }
+                , @($ColumnID, $Grouping.Sorting)
+            } else {
+                Write-Warning "New-HTMLTable - Row grouping skipped. Column '$($Grouping.Name)'/$ColumnID not found."
             }
-        } else {
-            Write-Warning 'New-HTMLTable - Row grouping disabled. Column name/id not found.'
+        })
+        if ($DefaultSortColumn.Count -gt 0 -or $DefaultSortIndex.Count -gt 0) {
+            Write-Warning 'New-HTMLTable - Row grouping sorting overwrites default sorting.'
         }
     } else {
         $SortingTranslate = [ordered] @{
@@ -1255,13 +1145,6 @@
     }
 
     # The table column options also adds to the columnDefs parameter
-    if ($RowGroupingColumnID -ne -1 -and $RowGrouping.HideColumn) {
-        $ColumnDefinitionList.Add([PSCustomObject]@{
-                targets    = $RowGroupingColumnID
-                visible    = $false
-                searchable = $true
-            })
-    }
     if ($TableColumnOptions.Count -gt 0) {
         foreach ($T in $TableColumnOptions) {
             $ColumnDefinitionList.Add($T)  # Corrected to use $T instead of $_
@@ -1297,7 +1180,15 @@
     }
 
 
-    $Options = $Options | ConvertTo-Json -Depth 8 #ConvertTo-JsonLiteral -Depth 6 -AdvancedReplace @{ '.' = '\.'; '$' = '\$' }
+    if ($SearchPaneColumns) {
+        $Options.searchPanes = @{ columns = @(foreach ($Name in $SearchPaneColumns) {
+            $Index = [array]::IndexOf($HeaderNames.ToUpper(), $Name.ToUpper())
+            if ($Index -ge 0) { $Index } else { Write-Warning "New-HTMLTable - Search pane column '$Name' not found." }
+        }) }
+    }
+    $ExportReplacements = Get-TableExportScript -Options $Options -ExportScope $ExportScope
+    $Options = $Options | ConvertTo-HTMLScriptJson -Depth 8
+    foreach ($Marker in $ExportReplacements.Keys) { $Options = $Options.Replace('"' + $Marker + '"', $ExportReplacements[$Marker]) }
 
     # cleans up $Options for ImmediatelyShowHiddenDetails
     # Since it's JavaScript inside we're basically removing double quotes from JSON in favor of no quotes at all
@@ -1313,16 +1204,6 @@
     # we need to cleanup $Options for columnDefs/render, remove \r\n
     #$Options = $Options -replace '\\r\\n', '\r\n' #-replace "\\`"",'"'
 
-    #
-    $ExportExcelOptions = @'
-    {
-        body: function (data, row, column, node) {
-            data = $('<p>' + data + '</p>').text(); return $.isNumeric(data.replace(',', '.')) ? data.replace(',', '.') : data;
-        }
-    }
-'@
-    $Options = $Options.Replace('"findExportOptions"', $ExportExcelOptions)
-
     if ($DataStore -eq 'JavaScript') {
         # Since we only want first level of data from DataTable we need to do it via string replacement.
         # ConvertTo-Json -Depth 6 from Options above would copy nested objects
@@ -1351,6 +1232,7 @@
                     # So we need to escape them here, so they don't break the JavaScript code
                     $DataToInsert = $DataToInsert -replace "<", "&lt;" -replace ">", "&gt;"
                 }
+                $DataToInsert = Protect-HTMLScriptData -Json $DataToInsert
                 if ($DataToInsert.StartsWith('[')) {
                     $Script:HTMLSchema.CustomFooterJS[$DataStoreID] = "var $DataStoreID = $DataToInsert;"
                 } else {
@@ -1377,6 +1259,7 @@
                 # So we need to escape them here, so they don't break the JavaScript code
                 $DataToInsert = $DataToInsert -replace "<", "&lt;" -replace ">", "&gt;"
             }
+            $DataToInsert = Protect-HTMLScriptData -Json $DataToInsert
             if ($DataToInsert.StartsWith('[')) {
                 $Options = $Options.Replace('"markerForDataReplacement"', $DataToInsert)
             } else {
@@ -1393,21 +1276,12 @@
     #     $Options = New-TableConditionalFormatting -Options $Options -ConditionalFormatting $ConditionalFormatting -Header $HeaderNames -DataStore $DataStore
     # }
     # Process Row Grouping. Ugly JS building
-    if ($RowGroupingColumnID -ne -1) {
-        $Options = Convert-TableRowGrouping -Options $Options -RowGroupingColumnID $RowGroupingColumnID
+    if ($RowGroupingColumns.Count -gt 0) {
+        $Options = Convert-TableRowGrouping -Options $Options -RowGroupingColumnID $RowGroupingColumns.ToArray() -HeaderNames $HeaderNames -DataStore $DataStore
         $RowGroupingTop = Add-TableRowGrouping -DataTableName $DataTableID -Top -Settings $RowGrouping
         $RowGroupingBottom = Add-TableRowGrouping -DataTableName $DataTableID -Bottom -Settings $RowGrouping
     }
 
-    [Array] $Tabs = ($Script:HTMLSchema.TabsHeaders | Where-Object { $_.Current -eq $true })
-    if ($Tabs.Count -eq 0) {
-        # There are no tabs in use, pretend there is only one Active Tab
-        $Tab = @{ Active = $true }
-    } else {
-        # Get First Tab
-        $Tab = $Tabs[0]
-    }
-
     # return data
     if (-not $Script:HTMLSchema['TableSimplify']) {
         $Script:HTMLSchema.Features.Jquery = $true
@@ -1419,62 +1293,35 @@
 
         # Enable Custom Date fromat sorting
         $SortingFormatDateTime = Add-CustomFormatForDatetimeSorting -DateTimeSortingFormat $DateTimeSortingFormat
-        $FilteringOutput = Add-TableFiltering -Filtering $Filtering -FilteringLocation $FilteringLocation -DataTableName $DataTableID -SearchRegularExpression:$SearchRegularExpression
+        $FilteringOutput = Add-TableFiltering -Filtering $Filtering -FilteringLocation $FilteringLocation -DataTableName $DataTableID -HeaderNames $HeaderNames -SearchRegularExpression:$SearchRegularExpression
         $FilteringTopCode = $FilteringOutput.FilteringTopCode
         $FilteringBottomCode = $FilteringOutput.FilteringBottomCode
-        $LoadSavedState = Add-TableState -DataTableName $DataTableID -Filtering $Filtering -FilteringLocation $FilteringLocation -SavedState (-not $DisableStateSave)
         if ($TableEvents.Count -gt 0) {
             $TableEventsCode = Add-TableEvent -Events $TableEvents -HeaderNames $HeaderNames -DataStore $DataStore
             # this adds required JS script to escape regex when needed
             $Script:HTMLSchema.Features.EscapeRegex = $true
         }
 
-        if ($Tab.Active -eq $true) {
-            New-HTMLTag -Tag 'script' {
-                @"
-                `$(document).ready(function() {
-                    $SortingFormatDateTime
+        New-HTMLTag -Tag 'script' {
+            @"
+            `$(document).ready(function () {
+                $SortingFormatDateTime
+                function initializeTable() {
+                    if (`$.fn.dataTable.isDataTable('#$DataTableID') || !`$('#$DataTableID').is(':visible')) { return; }
                     $RowGroupingTop
-                    $LoadSavedState
                     $FilteringTopCode
-                    //  Table code
-                    var table = `$('#$DataTableID').DataTable(
-                        $($Options)
-                    );
+                    var table = `$('#$DataTableID').DataTable($Options);
                     $FilteringBottomCode
                     $RowGroupingBottom
                     $TableEventsCode
-                });
-"@
-                if ($FixedHeader -or $FixedFooter) {
-                    "dataTablesFixedTracker['$DataTableID'] = true;"
                 }
-            }
-        } else {
-            [string] $TabName = $Tab.Id
-            New-HTMLTag -Tag 'script' {
-                @"
-                    `$(document).ready(function() {
-                        $SortingFormatDateTime
-                        $RowGroupingTop
-                        `$('.tabs').on('click', 'a', function (event) {
-                            if (`$(event.currentTarget).attr("data-id") == "$TabName" && !$.fn.dataTable.isDataTable("#$DataTableID")) {
-                                $LoadSavedState
-                                $FilteringTopCode
-                                //  Table code
-                                var table = `$('#$DataTableID').DataTable(
-                                    $($Options)
-                                );
-                                $FilteringBottomCode
-                            };
-                        });
-                        $RowGroupingBottom
-                    });
+                initializeTable();
+                document.addEventListener('pswh:tab:shown', initializeTable);
+                `$(document).on('click', '[data-tabs] > *', function () { setTimeout(initializeTable, 0); });
+                `$(document).on('showTab', function () { setTimeout(initializeTable, 0); });
+            });
 "@
-                if ($FixedHeader -or $FixedFooter) {
-                    "dataTablesFixedTracker['$DataTableID'] = true;"
-                }
-            }
+            if ($FixedHeader -or $FixedFooter) { "dataTablesFixedTracker['$DataTableID'] = true;" }
         }
     } else {
         $TableAttributes = @{ class = 'simplify' }
@@ -1507,10 +1354,10 @@
         $AfterTable = ''
     }
 
-    if ($RowGrouping.Attributes.Count -gt 0) {
-        $RowGroupingCSS = ConvertTo-LimitedCSS -ID $DataTableID -ClassName 'tr.dtrg-group td' -Attributes $RowGrouping.Attributes -Group
-    } else {
-        $RowGroupingCSS = ''
+    $RowGroupingCSS = for ($Level = 0; $Level -lt $RowGrouping.Count; $Level++) {
+        if ($RowGrouping[$Level].Attributes.Count -gt 0) {
+            ConvertTo-LimitedCSS -ID $DataTableID -ClassName "tr.dtrg-level-$Level td" -Attributes $RowGrouping[$Level].Attributes -Group
+        }
     }
 
     if ($Simplify) {
diff --git a/Public/New-HTMLTableStyle.ps1 b/Public/New-HTMLTableStyle.ps1
index 8dfe1846..20ef3c7b 100644
--- a/Public/New-HTMLTableStyle.ps1
+++ b/Public/New-HTMLTableStyle.ps1
@@ -174,10 +174,12 @@
     )
     $RowHoverSelected = @(
         'table.dataTable.hover tbody tr.odd:hover.selected, table.dataTable.display tbody tr.odd:hover.selected'
+        'table.dataTable.hover tbody tr.even:hover.selected, table.dataTable.display tbody tr.even:hover.selected'
         'table.dataTable.hover tbody tr:hover.selected, table.dataTable.display tbody tr:hover.selected'
         'table.dataTable.display tbody tr:hover.selected>.sorting_1, table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_1'
         'table.dataTable.display tbody tr:hover.selected>.sorting_2, table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_2'
         'table.dataTable.display tbody tr:hover.selected>.sorting_3, table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_3'
+        'table.dataTable.display tbody tr.odd:hover.selected>td, table.dataTable.display tbody tr.even:hover.selected>td, table.dataTable.hover tbody tr.odd:hover.selected>td, table.dataTable.hover tbody tr.even:hover.selected>td'
     )
 
     $TableStyle = [ordered] @{
@@ -207,6 +209,7 @@
     }
     if ($BackgroundColor) {
         $TableStyle['background-color'] = "$(ConvertFrom-Color -Color $BackgroundColor) !important"
+        if ($Type -eq 'RowHoverSelected') { $TableStyle['box-shadow'] = 'none !important' }
     }
     if ($BorderTopColor) {
         $TableStyle['border-top-color'] = "$(ConvertFrom-Color -Color $BorderTopColor) !important"
@@ -285,4 +288,4 @@ Register-ArgumentCompleter -CommandName New-HTMLTableStyle -ParameterName Border
 Register-ArgumentCompleter -CommandName New-HTMLTableStyle -ParameterName BorderRightColor -ScriptBlock $Script:ScriptBlockColors
 Register-ArgumentCompleter -CommandName New-HTMLTableStyle -ParameterName BorderLeftColor -ScriptBlock $Script:ScriptBlockColors
 Register-ArgumentCompleter -CommandName New-HTMLTableStyle -ParameterName BackgroundColor -ScriptBlock $Script:ScriptBlockColors
-Register-ArgumentCompleter -CommandName New-HTMLTableStyle -ParameterName TextColor -ScriptBlock $Script:ScriptBlockColors
\ No newline at end of file
+Register-ArgumentCompleter -CommandName New-HTMLTableStyle -ParameterName TextColor -ScriptBlock $Script:ScriptBlockColors
diff --git a/Public/New-HTMLText.ps1 b/Public/New-HTMLText.ps1
index 9be02e1b..54073632 100644
--- a/Public/New-HTMLText.ps1
+++ b/Public/New-HTMLText.ps1
@@ -1,4 +1,4 @@
-function New-HTMLText {
+function New-HTMLText {
     <#
     .SYNOPSIS
     This function provides ability to add new text to the HTML file.
@@ -275,47 +275,7 @@ function New-HTMLText {
 
         $newSpanTextSplat.LineBreak = $LineBreak
         New-HTMLSpanStyle @newSpanTextSplat {
-            $FindMe = [regex]::Matches($Text[$i], "\[[^\]]+\]\(\S+\)")
-            if ($FindMe) {
-                foreach ($find in $FindMe) {
-                    $LinkName = ([regex]::Match($Find.value, "[^\[]+(?=\])")).Value
-                    $LinkURL = ([regex]::Match($Find.value, "(?<=\().+(?=\))")).Value
-                    $Link = New-HTMLAnchor -HrefLink $LinkURL -Text $LinkName
-                    $Text[$i] = $Text[$i].Replace($find.value, $Link)
-                }
-                $Text[$i]
-            } else {
-                # Default
-                $Text[$i]
-            }
-            # Replaces code above -> JustinWGrote made it -> complains go to him
-            #$markdownRegex = '\[(?<title>[^\]]+)\]\((?<uri>https?.+?)\)[\s\r\n$]'
-            #$Text[$i] -replace $markdownRegex, '<a href="$2">$1</a>'
-
-            <#
-            if ($Text[$i] -match "\[[^\]]+\]\([^)]+\)") {
-                # Covers markdown LINK  "[somestring](https://evotec.xyz)"
-
-                $RegexBrackets1 = [regex] '\[[^\]]+\]\([^)]+\)'
-
-                $RegexBrackets1 = [regex] "\[([^\[]*)\]" # catch 'sometstring'
-                $RegexBrackets2 = [regex] "\(([^\[]*)\)" # catch link
-                $RegexBrackets3 = [regex] "\[([^\[]*)\)" # catch both somestring and link
-                $Text1 = $RegexBrackets1.match($Text[$i]).Groups[1].value
-                #$Text2 = $RegexBrackets2.match($Text[$i]).Groups[1].value
-                $Text3 = $RegexBrackets3.match($Text[$i]).Groups[0].value
-                if ($Text1 -ne '' -and $Text2 -ne '') {
-                    $Link = New-HTMLAnchor -HrefLink $Text2 -Text $Text1
-                    $Text[$i].Replace($Text3, $Link)
-                }
-            } else {
-                # Default
-                $Text[$i]
-                # if ($NewLine[$i]) {
-                #    '<br>'
-                #}
-            }
-            #>
+            ConvertFrom-HTMLTextLink -Text $Text[$i]
         }
     }
 
diff --git a/Public/New-HTMLTree.ps1 b/Public/New-HTMLTree.ps1
index 4ebccc59..893ffdf8 100644
--- a/Public/New-HTMLTree.ps1
+++ b/Public/New-HTMLTree.ps1
@@ -174,7 +174,7 @@
 
     $FancyTree['activate'] = "templateToReplace"
 
-    $FancyTreeJSON = $FancyTree | ConvertTo-Json -Depth 100 #| ForEach-Object { [System.Text.RegularExpressions.Regex]::Unescape($_) }
+    $FancyTreeJSON = $FancyTree | ConvertTo-HTMLScriptJson -Depth 100 #| ForEach-Object { [System.Text.RegularExpressions.Regex]::Unescape($_) }
 
     $FancyTreeJSON = $FancyTreeJSON -replace '"templateToReplace"', $Activation
 
diff --git a/Public/New-HTMLWinBox.ps1 b/Public/New-HTMLWinBox.ps1
index 41eebef4..b97ddb14 100644
--- a/Public/New-HTMLWinBox.ps1
+++ b/Public/New-HTMLWinBox.ps1
@@ -198,7 +198,7 @@
     }
 
     Remove-EmptyValue -Hashtable $Options
-    $OptionsJSON = $Options | ConvertTo-JsonLiteral
+    $OptionsJSON = $Options | ConvertTo-JsonLiteral | Protect-HTMLScriptData
 
     # We cheat and replace the string with proper element id
     if ($HTML) {
diff --git a/Public/New-NavTopMenu.ps1 b/Public/New-NavTopMenu.ps1
index 50197964..f2925d16 100644
--- a/Public/New-NavTopMenu.ps1
+++ b/Public/New-NavTopMenu.ps1
@@ -128,8 +128,11 @@
         # tracking for New-HTMLNavLink to know when it's being executed as part of TopMenu
         $Script:GlobalSchema['TopMenu'] = $true
         $MenuExecuted = & $MenuItem
+        $HeadingTag = if ($Href -or $InternalPageID) { 'a' } else { 'span' }
+        $HeadingAttributes = @{ class = 'dropdown-heading' }
+        if ($Href) { $HeadingAttributes.href = $Href } elseif ($InternalPageID) { $HeadingAttributes.href = '#' + $InternalPageID.TrimStart('#') }
         $Menu = New-HTMLTag -Tag 'li' {
-            New-HTMLTag -Tag 'span' -Attributes @{class = 'dropdown-heading' } {
+            New-HTMLTag -Tag $HeadingTag -Attributes $HeadingAttributes {
                 New-HTMLTag -Tag 'span' -Attributes @{ style = @{ "padding-right" = "5px" } } {
                     #New-HTMLFontIcon -IconSolid address-book
                     New-InternalNavIcon -IconBrands $IconBrands -IconRegular $IconRegular -IconSolid $IconSolid -IconMaterial $IconMaterial -Spinning:$Spinning.IsPresent -SpinningReverse:$SpinningReverse.IsPresent -IconColor $IconColor -Bordered:$Bordered.IsPresent -BorderedCircle:$BorderedCircle.IsPresent -PullLeft:$PullLeft.IsPresent -PullRight:$PullRight.IsPresent -Rotate $Rotate -FlipVertical:$FlipVertical.IsPresent -FlipHorizontal:$FlipHorizontal.IsPresent
@@ -148,4 +151,4 @@
     }
 }
 
-Register-ArgumentCompleter -CommandName New-HTMLNavTopMenu -ParameterName IconColor -ScriptBlock $Script:ScriptBlockColors
\ No newline at end of file
+Register-ArgumentCompleter -CommandName New-HTMLNavTopMenu -ParameterName IconColor -ScriptBlock $Script:ScriptBlockColors
diff --git a/Public/New-TableButtonCSV.ps1 b/Public/New-TableButtonCSV.ps1
index e0cd5cf7..3e82db1d 100644
--- a/Public/New-TableButtonCSV.ps1
+++ b/Public/New-TableButtonCSV.ps1
@@ -27,6 +27,9 @@
     .PARAMETER FieldBoundary
     The character used to enclose fields in the CSV file. Default value is '"'.
 
+    .PARAMETER RawData
+    Preserves formula-like text for programmatic consumers. By default, CSV export prefixes spreadsheet formulas with an apostrophe. Negative numeric values are preserved.
+
     .EXAMPLE
     New-TableButtonCSV -Title "Export to CSV" -FileName "data" -FieldSeparator "," -FieldBoundary "'"
 
@@ -44,7 +47,8 @@
         [string] $FileName,
         [switch] $DisableBOM,
         [string] $FieldSeparator = ';',
-        [string] $FieldBoundary = '"'
+        [string] $FieldBoundary = '"',
+        [switch] $RawData
     )
     if (-not $Script:HTMLSchema['TableSimplify']) {
         $Script:HTMLSchema.Features.DataTablesButtons = $true
@@ -65,6 +69,7 @@
         fieldSeparator = $FieldSeparator
         fieldBoundary  = $FieldBoundary
         bom            = -not $DisableBOM.IsPresent
+        pswhRawData    = $RawData.IsPresent
     }
     if ($FileName) {
         $Output['filename'] = $FileName
@@ -76,4 +81,4 @@
         Type   = 'TableButtonCSV'
         Output = $Output
     }
-}
\ No newline at end of file
+}
diff --git a/Public/New-TableButtonExcel.ps1 b/Public/New-TableButtonExcel.ps1
index 07b4ebbe..cd487818 100644
--- a/Public/New-TableButtonExcel.ps1
+++ b/Public/New-TableButtonExcel.ps1
@@ -12,6 +12,9 @@
     .PARAMETER ButtonName
     The text to be displayed on the button.
 
+    .PARAMETER TextColumns
+    Column names to export as text, including short numeric identifiers. Numeric values beyond 15 significant digits are automatically exported as text.
+
     .EXAMPLE
     New-TableButtonExcel -Title "Export to Excel" -ButtonName "Export"
 
@@ -24,13 +27,15 @@
     [CmdletBinding()]
     param(
         [string] $Title,
-        [string] $ButtonName
+        [string] $ButtonName,
+        [string[]] $TextColumns
     )
     $Script:HTMLSchema.Features.DataTablesButtons = $true
     $Script:HTMLSchema.Features.DataTablesButtonsHTML5 = $true
     $Script:HTMLSchema.Features.DataTablesButtonsExcel = $true
     $Output = @{}
     $Output['extend'] = 'excelHtml5'
+    $Output['pswhTextColumns'] = @($TextColumns)
     if ($ButtonName) {
         $Output['text'] = $ButtonName
     }
@@ -41,4 +46,4 @@
         Type   = 'TableButtonExcel'
         Output = $Output
     }
-}
\ No newline at end of file
+}
diff --git a/Public/New-TableHeader.ps1 b/Public/New-TableHeader.ps1
index e91e3630..015c4d13 100644
--- a/Public/New-TableHeader.ps1
+++ b/Public/New-TableHeader.ps1
@@ -40,6 +40,12 @@
     .PARAMETER Alignment
     Specifies the alignment of the table header.
 
+    .PARAMETER TitleAlignment
+    Overrides alignment for a merged or full-row title.
+
+    .PARAMETER NamesAlignment
+    Aligns the individual column names independently of a merged title.
+
     .PARAMETER TextDecoration
     Specifies the text decoration of the table header.
 
@@ -81,6 +87,8 @@
         [ValidateSet('normal', 'small-caps')][string] $FontVariant,
         [string] $FontFamily,
         [ValidateSet('left', 'center', 'right', 'justify')][string] $Alignment,
+        [ValidateSet('left', 'center', 'right', 'justify')][string] $TitleAlignment,
+        [ValidateSet('left', 'center', 'right', 'justify')][string] $NamesAlignment,
         [ValidateSet('none', 'line-through', 'overline', 'underline')][string] $TextDecoration,
         [ValidateSet('uppercase', 'lowercase', 'capitalize')][string] $TextTransform,
         [ValidateSet('rtl', 'ltr')][string] $Direction,
@@ -145,6 +153,8 @@
         BorderColor     = $BorderColor
     }
     Remove-EmptyValue -Hashtable $Style
+    if ($Title -and $TitleAlignment) { $Style.Alignment = $TitleAlignment }
+    elseif (-not $Title -and $NamesAlignment) { $Style.Alignment = $NamesAlignment }
 
     if (($AddRow -and $Title) -or ($Title -and -not $Names)) {
         $Type = 'TableHeaderFullRow'
@@ -166,6 +176,7 @@
             ResponsiveOperations = $ResponsiveOperations
             Title                = $Title
             Style                = ConvertTo-HTMLStyle @Style
+            NamesStyle           = if ($NamesAlignment) { @{ 'text-align' = $NamesAlignment } } else { @{} }
             ColumnCount          = $ColumnCount
         }
     }
diff --git a/Resources/JS/pswritehtml-table-export.js b/Resources/JS/pswritehtml-table-export.js
new file mode 100644
index 00000000..2f2898be
--- /dev/null
+++ b/Resources/JS/pswritehtml-table-export.js
@@ -0,0 +1,91 @@
+// PSWriteHTML policy around the pinned DataTables Buttons implementation.
+function pswhConfigureExport(config, scope) {
+    var textColumns = config.pswhTextColumns || [];
+    var rawCsv = !!config.pswhRawData;
+    delete config.pswhTextColumns;
+    delete config.pswhRawData;
+    var options = config.exportOptions = config.exportOptions || {};
+    var modifier = options.modifier = options.modifier || {};
+    if (scope === 'All' || scope === 'Filtered') {
+        modifier.selected = null;
+        modifier.search = scope === 'All' ? 'none' : 'applied';
+    } else if (scope === 'Selected') {
+        modifier.selected = true;
+        modifier.search = 'applied';
+    }
+    var originalFormat = options.format && options.format.body;
+    options.format = options.format || {};
+    function safeCsv(text) {
+        if (!rawCsv && /^[\s\u0000-\u001f]*[=+@-]/.test(text) && !/^\s*-\d+(?:[.,]\d+)?(?:[eE][+-]?\d+)?\s*$/.test(text)) {
+            return "'" + text;
+        }
+        return text;
+    }
+    options.format.body = function (data, row, column, node) {
+        if (originalFormat) { data = originalFormat(data, row, column, node); }
+        var element = document.createElement('div');
+        element.innerHTML = data == null ? '' : String(data);
+        var text = element.textContent;
+        // Keep ordinary negative numbers numeric; expressions still receive protection.
+        if (config.extend === 'csvHtml5') { text = safeCsv(text); }
+        if (config.extend === 'excelHtml5' && /^-?\d+,\d+$/.test(text)) { text = text.replace(',', '.'); }
+        return text;
+    };
+    if (config.extend === 'csvHtml5') {
+        ['header', 'footer'].forEach(function (part) {
+            var original = options.format[part];
+            options.format[part] = function (data, column, node) {
+                if (original) { data = original(data, column, node); }
+                var element = document.createElement('div');
+                element.innerHTML = data == null ? '' : String(data);
+                return safeCsv(element.textContent);
+            };
+        });
+    }
+    if (config.extend === 'excelHtml5') {
+        var exportData;
+        var originalData = options.customizeData;
+        options.customizeData = function (data) {
+            if (originalData) { originalData(data); }
+            exportData = data;
+        };
+        var originalCustomize = config.customize;
+        config.customize = function (xlsx, button, api) {
+            if (exportData) {
+                var info = api.buttons.exportInfo(button);
+                var firstRow = 1 + (info.title ? 1 : 0) + (info.messageTop ? 1 : 0) + (button.header ? 1 : 0);
+                var sheet = xlsx.xl.worksheets['sheet1.xml'];
+                exportData.body.forEach(function (row, index) {
+                    var worksheetRow = sheet.querySelector('row[r="' + (firstRow + index) + '"]');
+                    if (!worksheetRow) { return; }
+                    row.forEach(function (value, column) {
+                        var explicitText = textColumns.some(function (name) {
+                            return String(name).toLowerCase() === String(exportData.header[column]).toLowerCase();
+                        });
+                        var numeric = String(value).trim();
+                        var coefficient = numeric.split(/[eE]/)[0].replace(/^[+-]/, '').replace('.', '').replace(/^0+/, '');
+                        var preciseNumber = /^[+-]?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?$/.test(numeric) && coefficient.length > 15;
+                        if (!explicitText && !preciseNumber) { return; }
+                        var cells = worksheetRow.querySelectorAll('c');
+                        // Empty cells may be omitted by Buttons: use Excel column letters.
+                        var letter = '', number = column + 1;
+                        while (number > 0) { number--; letter = String.fromCharCode(65 + number % 26) + letter; number = Math.floor(number / 26); }
+                        var cell = Array.prototype.find.call(cells, function (candidate) { return candidate.getAttribute('r') === letter + (firstRow + index); });
+                        if (!cell) { return; }
+                        while (cell.firstChild) { cell.removeChild(cell.firstChild); }
+                        cell.setAttribute('t', 'inlineStr');
+                        cell.removeAttribute('s');
+                        var inline = sheet.createElementNS(cell.namespaceURI, 'is');
+                        var text = sheet.createElementNS(cell.namespaceURI, 't');
+                        text.setAttribute('xml:space', 'preserve');
+                        text.textContent = value == null ? '' : String(value);
+                        inline.appendChild(text);
+                        cell.appendChild(inline);
+                    });
+                });
+            }
+            if (originalCustomize) { originalCustomize(xlsx, button, api); }
+        };
+    }
+    return config;
+}
diff --git a/Resources/JS/tabbisNavigation.js b/Resources/JS/tabbisNavigation.js
new file mode 100644
index 00000000..8114d2bf
--- /dev/null
+++ b/Resources/JS/tabbisNavigation.js
@@ -0,0 +1,64 @@
+// Navigation and accessibility for PSWriteHTML's existing tabbis integration.
+(function () {
+    function sync(group) {
+        group.setAttribute('role', 'tablist');
+        Array.prototype.forEach.call(group.children, function (tab) {
+            var selected = tab.classList.contains('active');
+            tab.setAttribute('role', 'tab');
+            tab.setAttribute('tabindex', selected ? '0' : '-1');
+            tab.setAttribute('aria-selected', String(selected));
+            tab.setAttribute('aria-controls', tab.id + '-Content');
+            var pane = document.getElementById(tab.id + '-Content');
+            if (pane) {
+                pane.setAttribute('role', 'tabpanel');
+                pane.setAttribute('aria-labelledby', tab.id);
+            }
+        });
+    }
+    function revealHash() {
+        var id;
+        try { id = decodeURIComponent(location.hash.slice(1)); } catch (error) { return; }
+        var target = document.getElementById(id);
+        if (!target) { return; }
+        var pane = target.closest('[data-panes] > div');
+        var parents = [];
+        while (pane) {
+            var tab = document.getElementById(pane.id.replace(/-Content$/, ''));
+            if (tab && tab.parentElement.hasAttribute('data-tabs')) { parents.unshift(tab); }
+            pane = pane.parentElement.parentElement.closest('[data-panes] > div');
+        }
+        parents.forEach(function (tab) { tab.click(); sync(tab.parentElement); });
+        if (target.parentElement && target.parentElement.hasAttribute('data-tabs')) {
+            target.click();
+            sync(target.parentElement);
+        }
+    }
+    function ready() {
+        document.querySelectorAll('[data-tabs]').forEach(function (group) {
+            sync(group);
+            group.addEventListener('click', function () { setTimeout(function () { sync(group); }, 0); });
+            group.addEventListener('keydown', function (event) {
+                var tabs = Array.prototype.slice.call(group.children);
+                var index = tabs.indexOf(document.activeElement);
+                if (index < 0) { return; }
+                if (event.key === 'ArrowRight' || event.key === 'ArrowDown') { index = (index + 1) % tabs.length; }
+                else if (event.key === 'ArrowLeft' || event.key === 'ArrowUp') { index = (index + tabs.length - 1) % tabs.length; }
+                else if (event.key === 'Home') { index = 0; }
+                else if (event.key === 'End') { index = tabs.length - 1; }
+                else if (event.key !== 'Enter' && event.key !== ' ') { return; }
+                event.preventDefault();
+                tabs[index].click();
+                tabs[index].focus();
+                sync(group);
+            });
+        });
+        // Apply deep links after the library and authored default-tab handlers.
+        setTimeout(function () {
+            document.querySelectorAll('[data-tabs]').forEach(sync);
+            revealHash();
+        }, 0);
+        window.addEventListener('hashchange', revealHash);
+    }
+    if (document.readyState === 'loading') { document.addEventListener('DOMContentLoaded', ready); }
+    else { ready(); }
+})();
diff --git a/Tests/ReportCorrectness.Tests.ps1 b/Tests/ReportCorrectness.Tests.ps1
new file mode 100644
index 00000000..f963cce1
--- /dev/null
+++ b/Tests/ReportCorrectness.Tests.ps1
@@ -0,0 +1,127 @@
+BeforeAll {
+    Import-Module (Join-Path $PSScriptRoot '../PSWriteHTML.psd1') -Force
+}
+
+Describe 'Report data and script boundaries' {
+    It 'preserves arrays, dates and values in caller objects across repeated table rendering' {
+        $Row = [PSCustomObject]@{ Name = 'Server'; Items = @('One', 'Two'); Date = [DateTime]'2026-10-03' }
+        $null = New-HTML -Online {
+            New-HTMLTableOption -ArrayJoin -DateTimeFormat 'yyyy-MM-dd'
+            New-HTMLTable -DataTable $Row -HideButtons
+            New-HTMLTable -DataTable $Row -HideButtons
+        }
+        $Row.Items.GetType().FullName | Should -Be 'System.Object[]'
+        $Row.Items.Count | Should -Be 2
+        $Row.Date | Should -BeOfType [DateTime]
+        $Row.Date | Should -Be ([DateTime]'2026-10-03')
+    }
+
+    It 'round-trips script data, including one-element arrays and multiple pipeline records' {
+        InModuleScope PSWriteHTML {
+            $Value = "C:\new\temp`nquoted `"text`" '</script>'" + [char]0x2028
+            $Json = ConvertTo-HTMLScriptJson -InputObject @($Value) -Compress
+            $Json.StartsWith('[') | Should -BeTrue
+            ($Json | ConvertFrom-Json) | Should -Be $Value
+            $Json | Should -Not -Match '</script>'
+            $Many = @([PSCustomObject]@{ Name = 'One' }, [PSCustomObject]@{ Name = 'Two' }) | ConvertTo-HTMLScriptJson
+            ($Many | ConvertFrom-Json).Count | Should -Be 2
+        }
+    }
+
+    It 'uses one valid JSON string for multiline Markdown with backslashes and closing script text' {
+        $Text = "C:\new\temp`nSecond 'line' </script>"
+        $Html = New-HTML -Online { New-HTMLMarkdown -Content $Text -SanitezeHTML }
+        $Match = [regex]::Match($Html, 'let text\w+ = (.+);')
+        $Match.Success | Should -BeTrue
+        ($Match.Groups[1].Value | ConvertFrom-Json) | Should -Be ($Text + "`n")
+    }
+
+    It 'evaluates hidden helper columns and preserves visible-column highlighting in email tables' {
+        $Rows = @([PSCustomObject]@{ Name = 'Bad server'; Status = 'Bad' }, [PSCustomObject]@{ Name = 'Good server'; Status = 'Good' })
+        $Html = EmailBody {
+            New-HTMLTable -DataTable $Rows -ExcludeProperty Status {
+                New-TableCondition -Name Status -Value Bad -Operator eq -BackgroundColor Red -Row -Inline
+            }
+        }
+        $Html | Should -Match '<td style="background-color:#ff0000">Bad server</td>'
+        $Html | Should -Match '<td>Good server</td>'
+        $Html | Should -Not -Match '<th>Status</th>'
+    }
+
+    It 'compares decoded text and native dates without changing the displayed values' {
+        $Rows = @([PSCustomObject]@{ Name = 'A & B'; Date = [DateTime]'2026-10-03'; Status = 'Good' })
+        $Html = EmailBody {
+            New-HTMLTableOption -DateTimeFormat 'yyyy-MM-dd'
+            New-HTMLTable -DataTable $Rows -ExcludeProperty Status {
+                New-TableCondition -Name Name -Value 'A & B' -Operator eq -BackgroundColor Red -Inline
+                New-TableCondition -Name Date -Value ([DateTime]'2026-10-03') -ComparisonType date -Operator eq -BackgroundColor Blue -Inline
+            }
+        }
+        $Html | Should -Match '<td style="background-color:#ff0000">A &amp; B</td>'
+        $Html | Should -Match '<td style="background-color:#0000ff">2026-10-03</td>'
+    }
+
+    It 'keeps helper fields aligned when preceding source values are arrays' {
+        $Row = [PSCustomObject]@{ Name = 'Server'; Items = @('One', 'Two'); Status = 'Bad' }
+        $Html = EmailBody {
+            New-HTMLTableOption -ArrayJoin
+            New-HTMLTable -DataTable $Row -ExcludeProperty Status {
+                New-TableCondition -Name Status -Value Bad -Operator eq -BackgroundColor Red -Row -Inline
+            }
+        }
+        $Html | Should -Match '<td style="background-color:#ff0000">Server</td>'
+        $Html | Should -Match '<td style="background-color:#ff0000">One, Two</td>'
+    }
+}
+
+Describe 'Portable content and column presentation' {
+    It 'parses parenthesized labels and nested URL parentheses without modifying the input array' {
+        $Text = @('[Label (RODCs)](https://example.com/a_(b_(c)))', '[Other](https://example.com/)')
+        $Html = New-HTML -Online { New-HTMLText -Text $Text }
+        $Html | Should -Match 'href="https://example.com/a_\(b_\(c\)\)">Label \(RODCs\)</a>'
+        $Text[0] | Should -Be '[Label (RODCs)](https://example.com/a_(b_(c)))'
+    }
+
+    It 'embeds local Markdown images from the source directory and retains the opt-out' {
+        $Source = Join-Path $TestDrive 'markdown'
+        $null = New-Item -ItemType Directory -Path (Join-Path $Source 'images')
+        [IO.File]::WriteAllBytes((Join-Path $Source 'images/pixel.png'), [Convert]::FromBase64String('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+j/XcAAAAASUVORK5CYII='))
+        $File = Join-Path $Source 'sample.md'
+        '![local](images/pixel.png)' | Set-Content -LiteralPath $File
+        $Embedded = New-HTML -Online { New-HTMLMarkdown -FilePath $File }
+        $Embedded | Should -Match 'data:image/png;base64,'
+        $Linked = New-HTML -Online { New-HTMLMarkdown -FilePath $File -EmbedImages $false }
+        $Linked | Should -Match 'images/pixel.png'
+    }
+
+    It 'does not embed files outside the Markdown image source directory' {
+        $Source = Join-Path $TestDrive 'contained'
+        $null = New-Item -ItemType Directory -Path $Source
+        [IO.File]::WriteAllBytes((Join-Path $TestDrive 'outside.png'), [byte[]]@(1, 2, 3))
+        $Html = New-HTML -Online { New-HTMLMarkdown -Content '![outside](../outside.png)' -ImageBase $Source }
+        $Html | Should -Not -Match 'data:image/'
+    }
+
+    It 'leaves non-image files and ordinary link references untouched' {
+        $Source = Join-Path $TestDrive 'references'
+        $null = New-Item -ItemType Directory -Path $Source
+        'private text' | Set-Content -LiteralPath (Join-Path $Source 'secret.txt')
+        [IO.File]::WriteAllBytes((Join-Path $Source 'pixel.png'), [Convert]::FromBase64String('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+j/XcAAAAASUVORK5CYII='))
+        $Content = "![text](secret.txt)`n[ordinary link][download]`n[download]: pixel.png`n![image][photo]`n[photo]: pixel.png"
+        $Html = New-HTML -Online { New-HTMLMarkdown -Content $Content -ImageBase $Source }
+        $Html | Should -Match '\[download\]: pixel.png'
+        $Html | Should -Match 'secret.txt'
+        $Html | Should -Match '\[photo\]: data:image/png;base64,'
+    }
+
+    It 'styles merged titles and column names independently' {
+        $Html = New-HTML -Online {
+            New-HTMLTable -DataTable ([PSCustomObject]@{ Name = 'One'; Value = 1 }) -HideButtons {
+                New-TableHeader -Names Name, Value -Title 'Details' -TitleAlignment center -NamesAlignment right
+            }
+        }
+        $Html | Should -Match '<th[^>]*text-align:center[^>]*>Details</th>'
+        $Html | Should -Match '<th style="text-align:right">Name</th>'
+        $Html | Should -Match '<th style="text-align:right">Value</th>'
+    }
+}
diff --git a/readme.md b/readme.md
index ef4e58dc..a2404f94 100644
--- a/readme.md
+++ b/readme.md
@@ -67,6 +67,27 @@ Dependencies: **PSSharedGoods**, **PSWriteColor** and **Connectimo** are only us
 - 🔗 [Creating Office 365 Migration Diagram with PowerShell](https://evotec.xyz/creating-office-365-migration-diagram-with-powershell/)
 - 🔗 [Advanced HTML reporting using PowerShell](https://evotec.xyz/advanced-html-reporting-using-powershell/)
 
+## Table exports and portable Markdown
+
+Use `-ExportScope Filtered` to export every matching row even when some rows are selected. `All` exports the complete table, `Selected` exports selected matching rows, and the default `Automatic` retains DataTables' selection and filtering behavior.
+
+```powershell
+New-HTML -FilePath './report.html' {
+    New-HTMLTable -DataTable $Rows -Filtering -FilteringLocation Top -ExportScope Filtered {
+        New-TableButtonExcel -TextColumns 'AccountNumber', 'EmployeeId'
+        New-TableButtonCSV
+    }
+}
+```
+
+Excel exports keep numeric values with more than 15 significant digits as text. `-TextColumns` also preserves shorter identifiers as text while other numeric columns remain available for calculations. CSV exports quote fields and prefix formula-like text with an apostrophe; ordinary negative numbers retain their values. Use `New-TableButtonCSV -RawData` when a programmatic consumer needs the original formula-like text.
+
+Each `New-TableRowGrouping` adds a grouping level in declaration order. Inline table conditions can use helper properties excluded from the displayed table with `-ExcludeProperty`. `New-TableHeader -TitleAlignment center -NamesAlignment right` sets merged-title and column-name alignment independently. `-SearchPaneColumns` limits enabled search panes to named columns.
+
+`New-HTMLMarkdown -FilePath './notes/readme.md'` embeds relative local images from the Markdown source directory so the HTML can be moved to another folder. `-ImageBase` supplies a directory for content provided directly, and `-EmbedImages $false` retains relative references. Embedding stays within the specified source directory and skips symbolic links.
+
+For smaller reports, select only the buttons needed with `-Buttons csvHtml5`, or use `-HideButtons`. Offline reports embed the assets required by those capabilities.
+
 ## Changelog
 
 `PSWriteHTML` undergoes changes that hopefully will make it more versalite, consistent and better.

From 17633bfec4536c827d9ddbc38faedd9dfba956b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20K=C5=82ys?= <przemyslaw.klys@evotec.pl>
Date: Sat, 3 Oct 2026 21:31:57 +0200
Subject: [PATCH 2/4] Preserve hidden and scrolling table behavior and literal
 Markdown

---
 .github/workflows/ci.yml                      | 28 ++--------------
 ...mages.ps1 => Get-HTMLMarkdownImageMap.ps1} | 33 +++++++++++--------
 Private/Tables/Add-TableFiltering.ps1         | 21 ++++++++----
 Public/New-HTMLMarkdown.ps1                   | 10 +++++-
 Public/New-HTMLTable.ps1                      | 14 ++++++++
 Tests/ReportCorrectness.Tests.ps1             |  5 ++-
 6 files changed, 63 insertions(+), 48 deletions(-)
 rename Private/{Resolve-HTMLMarkdownImages.ps1 => Get-HTMLMarkdownImageMap.ps1} (71%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c6823b9..7e3587db 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,6 @@ jobs:
         uses: actions/checkout@v7
         with:
           fetch-depth: 0
-          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref }}
 
       - name: Setup PowerShell modules
         run: |
@@ -36,33 +35,12 @@ jobs:
           Install-Module PSSharedGoods -Force -Scope CurrentUser -AllowClobber
         shell: pwsh
 
-      - name: Refresh module manifest
-        env:
-          RefreshPSD1Only: 'true'
+      - name: Validate module manifest
         run: |
-          ./Build/Build-Module.ps1
+          Test-ModuleManifest -Path ./PSWriteHTML.psd1 -ErrorAction Stop
         shell: pwsh
 
-      - name: Commit refreshed PSD1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          HEAD_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.ref || github.ref_name }}
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add PSWriteHTML.psd1
-          git diff --cached --quiet
-          if ($LASTEXITCODE -eq 0) {
-            Write-Host "No PSD1 changes to commit."
-          } elseif ($LASTEXITCODE -eq 1) {
-            git commit -m "chore: regenerate psd1"
-            git push origin HEAD:$Env:HEAD_BRANCH
-          } else {
-            throw "Unable to inspect staged PSD1 changes (git exit code $LASTEXITCODE)."
-          }
-        shell: pwsh
-
-      - name: Upload refreshed manifest
+      - name: Upload validated manifest
         uses: actions/upload-artifact@v7
         with:
           name: psd1
diff --git a/Private/Resolve-HTMLMarkdownImages.ps1 b/Private/Get-HTMLMarkdownImageMap.ps1
similarity index 71%
rename from Private/Resolve-HTMLMarkdownImages.ps1
rename to Private/Get-HTMLMarkdownImageMap.ps1
index 58b1832e..96a2c8d3 100644
--- a/Private/Resolve-HTMLMarkdownImages.ps1
+++ b/Private/Get-HTMLMarkdownImageMap.ps1
@@ -1,7 +1,7 @@
-function Resolve-HTMLMarkdownImages {
+function Get-HTMLMarkdownImageMap {
     <#
     .SYNOPSIS
-    Embeds relative Markdown image files contained beneath an explicit source directory.
+    Maps relative Markdown image URLs to embedded images beneath an explicit source directory.
     #>
     [CmdletBinding()]
     param([string] $Content, [string] $ImageBase)
@@ -11,30 +11,35 @@
     $ImageReferences = @(foreach ($Reference in [regex]::Matches($Content, '!\[(?<Label>[^\]]*)\](?:\[(?<Reference>[^\]]*)\])?(?!\()')) {
         if ($Reference.Groups['Reference'].Value) { $Reference.Groups['Reference'].Value } else { $Reference.Groups['Label'].Value }
     })
-    # Inline images and image reference definitions retain their label and optional title.
+    # Collect candidate URLs without rewriting Markdown; Showdown identifies
+    # rendered images separately from code samples and escaped syntax.
     $Pattern = '(?<Prefix>!\[[^\]]*\]\(\s*|(?m:^\s*\[[^\]]+\]:\s*))(?<Path><[^>]+>|(?:[^()\s]|\((?<Depth>)|\)(?<-Depth>))+)(?(Depth)(?!))'
-    [regex]::Replace($Content, $Pattern, [System.Text.RegularExpressions.MatchEvaluator]{
-        param($Match)
+    $Images = @{}
+    foreach ($Match in [regex]::Matches($Content, $Pattern)) {
         if (-not $Match.Groups['Prefix'].Value.StartsWith('!')) {
             $Reference = [regex]::Match($Match.Groups['Prefix'].Value, '\[([^\]]+)\]').Groups[1].Value
-            if ($ImageReferences -notcontains $Reference) { return $Match.Value }
+            if ($ImageReferences -notcontains $Reference) { continue }
         }
         $Path = $Match.Groups['Path'].Value.Trim('<', '>')
-        if ($Path -match '^[a-z][a-z0-9+.-]*:|^[/\\]' -or $Path.StartsWith('#')) { return $Match.Value }
+        if ($Path -match '^[a-z][a-z0-9+.-]*:|^[/\\]' -or $Path.StartsWith('#')) { continue }
         $Relative = [Uri]::UnescapeDataString(($Path -split '[?#]', 2)[0]).Replace('/', [IO.Path]::DirectorySeparatorChar)
         $Candidate = [IO.Path]::GetFullPath((Join-Path $BasePath $Relative))
-        if (-not $Candidate.StartsWith($Prefix, $Comparison) -or -not [IO.File]::Exists($Candidate)) { return $Match.Value }
-        if ([IO.Path]::GetExtension($Candidate) -notin '.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg', '.bmp', '.ico', '.tif', '.tiff') { return $Match.Value }
+        if (-not $Candidate.StartsWith($Prefix, $Comparison) -or -not [IO.File]::Exists($Candidate)) { continue }
+        if ([IO.Path]::GetExtension($Candidate) -notin '.png', '.jpg', '.jpeg', '.gif', '.webp', '.svg', '.bmp', '.ico', '.tif', '.tiff') { continue }
         # Do not follow junctions or symlinks outside the permitted image source tree.
         $Item = Get-Item -LiteralPath $Candidate
-        if ($Item.Attributes -band [IO.FileAttributes]::ReparsePoint) { return $Match.Value }
+        if ($Item.Attributes -band [IO.FileAttributes]::ReparsePoint) { continue }
         $Directory = $Item.Directory
+        $Linked = $false
         while ($Directory -and $Directory.FullName.StartsWith($Prefix, $Comparison)) {
-            if ($Directory.Attributes -band [IO.FileAttributes]::ReparsePoint) { return $Match.Value }
+            if ($Directory.Attributes -band [IO.FileAttributes]::ReparsePoint) { $Linked = $true; break }
             $Directory = $Directory.Parent
         }
+        if ($Linked) { continue }
+        if ($Images.ContainsKey($Path)) { continue }
         $DataUri = Convert-ImageToBinary -ImageFile $Candidate
-        if ($DataUri -notlike 'data:image/*') { return $Match.Value }
-        $Match.Groups['Prefix'].Value + $DataUri
-    })
+        if ($DataUri -notlike 'data:image/*') { continue }
+        $Images[$Path] = $DataUri
+    }
+    return $Images
 }
diff --git a/Private/Tables/Add-TableFiltering.ps1 b/Private/Tables/Add-TableFiltering.ps1
index a114ac4f..3566a66e 100644
--- a/Private/Tables/Add-TableFiltering.ps1
+++ b/Private/Tables/Add-TableFiltering.ps1
@@ -36,29 +36,36 @@
 "@
     }
     $Output.FilteringBottomCode = @"
-        var filterInputs = `$('#$DataTableName thead .pswritehtml-filter-row input, #$DataTableName tfoot tr:not(.pswritehtml-static-footer-row) input');
+        function bindColumnFilters(currentTable) {
+        var filterInputs = `$(currentTable.table().header()).find('.pswritehtml-filter-row input')
+            .add(`$(currentTable.table().footer()).find('tr:not(.pswritehtml-static-footer-row) input'));
         filterInputs.each(function () {
             var input = this;
-            table.columns().every(function () {
+            currentTable.columns().every(function () {
                 if (`$(this.header()).text() === input.placeholder) { `$(input).data('pswh-header', this.header()); }
             });
-        }).on('keyup change', function () {
+        }).off('.pswhFilters').on('keyup.pswhFilters change.pswhFilters', function () {
             var header = `$(this).data('pswh-header');
             if (!header) { return; }
-            var column = table.column(header);
+            var column = currentTable.column(header);
             if (column.search() !== this.value) { column.search(this.value, $RegEx, $Smart).draw(); }
-        }).on('click', function (event) { event.stopPropagation(); });
+        }).on('click.pswhFilters', function (event) { event.stopPropagation(); });
         function syncColumnFilters() {
             filterInputs.each(function () {
                 var header = `$(this).data('pswh-header');
                 if (!header) { return; }
-                var column = table.column(header);
+                var column = currentTable.column(header);
                 `$(this).val(column.search());
                 `$(this).closest('th').toggle(column.visible() && `$(header).css('display') !== 'none');
             });
         }
-        table.on('draw.dt responsive-resize.dt column-visibility.dt column-reorder.dt', syncColumnFilters);
+        currentTable.off('.pswhFilterSync').on('draw.dt.pswhFilterSync responsive-resize.dt.pswhFilterSync column-visibility.dt.pswhFilterSync column-reorder.dt.pswhFilterSync', syncColumnFilters);
         syncColumnFilters();
+        }
+        bindColumnFilters(table);
+        `$('#$DataTableName').on('init.dt.pswhFilters', function (event, settings) {
+            if (settings.nTable.id === '$DataTableName') { bindColumnFilters(new `$.fn.dataTable.Api(settings)); }
+        });
 "@
     return $Output
 }
diff --git a/Public/New-HTMLMarkdown.ps1 b/Public/New-HTMLMarkdown.ps1
index b2bc73e0..64c7e69e 100644
--- a/Public/New-HTMLMarkdown.ps1
+++ b/Public/New-HTMLMarkdown.ps1
@@ -132,9 +132,10 @@
     }
 
     $JoinedContent = [string]::Join("`n", [string[]]$Content) + "`n"
+    $ImageMap = @{}
     if ($EmbedImages -and ($FilePath -or $ImageBase)) {
         if (-not $ImageBase) { $ImageBase = Split-Path -Parent (Convert-Path -LiteralPath $FilePath) }
-        $JoinedContent = Resolve-HTMLMarkdownImages -Content $JoinedContent -ImageBase $ImageBase
+        $ImageMap = Get-HTMLMarkdownImageMap -Content $JoinedContent -ImageBase $ImageBase
     }
     if ($EnableTOC) {
         $JoinedContent = $JoinedContent.Replace('[TOC]', '[toc]')
@@ -199,6 +200,8 @@
     $IdJSON = ConvertTo-HTMLScriptJson -InputObject $Id -Compress
     $OptionsJSON = $Options | ConvertTo-HTMLScriptJson
     $OptionsJSON = $OptionsJSON -replace '"tocReplaceMe"', 'showdownToc()'
+    $ImageMapJSON = ConvertTo-HTMLScriptJson -InputObject $ImageMap -Compress
+    $ImagesVariable = "images$TextVariable"
 
     New-HTMLPanel -Invisible {
         New-HTMLTag -Tag 'div' -Attributes @{ class = 'markdown-body'; id = $Id } {}
@@ -219,6 +222,11 @@
             if ($MarkdownFlavor) {
                 "$ConverterVariable.setFlavor('$MarkdownFlavor');"
             }
+            if ($ImageMap.Count -gt 0) {
+                "var $ImagesVariable = $ImageMapJSON;"
+                # Let Showdown identify actual images before replacing URLs.
+                "$VariableOutput.querySelectorAll('img').forEach(function (image) { var source = image.getAttribute('src'); if (Object.prototype.hasOwnProperty.call($ImagesVariable, source)) { image.src = $ImagesVariable[source]; } });"
+            }
         } -NewLine
         $Script
     }
diff --git a/Public/New-HTMLTable.ps1 b/Public/New-HTMLTable.ps1
index 2322dcd4..b7c6a4b0 100644
--- a/Public/New-HTMLTable.ps1
+++ b/Public/New-HTMLTable.ps1
@@ -1306,8 +1306,11 @@
             @"
             `$(document).ready(function () {
                 $SortingFormatDateTime
+                var visibilityObserver;
                 function initializeTable() {
                     if (`$.fn.dataTable.isDataTable('#$DataTableID') || !`$('#$DataTableID').is(':visible')) { return; }
+                    if (visibilityObserver) { visibilityObserver.disconnect(); }
+                    `$(window).off('resize', initializeTable);
                     $RowGroupingTop
                     $FilteringTopCode
                     var table = `$('#$DataTableID').DataTable($Options);
@@ -1316,6 +1319,17 @@
                     $TableEventsCode
                 }
                 initializeTable();
+                // Other containers reveal their contents through ancestor styles
+                // or classes, independently of tab events.
+                if (!`$.fn.dataTable.isDataTable('#$DataTableID') && typeof MutationObserver !== 'undefined') {
+                    visibilityObserver = new MutationObserver(initializeTable);
+                    var ancestor = document.getElementById('$DataTableID').parentElement;
+                    while (ancestor) {
+                        visibilityObserver.observe(ancestor, {attributes: true, attributeFilter: ['style', 'class', 'hidden']});
+                        ancestor = ancestor.parentElement;
+                    }
+                    `$(window).on('resize', initializeTable);
+                }
                 document.addEventListener('pswh:tab:shown', initializeTable);
                 `$(document).on('click', '[data-tabs] > *', function () { setTimeout(initializeTable, 0); });
                 `$(document).on('showTab', function () { setTimeout(initializeTable, 0); });
diff --git a/Tests/ReportCorrectness.Tests.ps1 b/Tests/ReportCorrectness.Tests.ps1
index f963cce1..621c9f83 100644
--- a/Tests/ReportCorrectness.Tests.ps1
+++ b/Tests/ReportCorrectness.Tests.ps1
@@ -108,10 +108,13 @@ Describe 'Portable content and column presentation' {
         'private text' | Set-Content -LiteralPath (Join-Path $Source 'secret.txt')
         [IO.File]::WriteAllBytes((Join-Path $Source 'pixel.png'), [Convert]::FromBase64String('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+j/XcAAAAASUVORK5CYII='))
         $Content = "![text](secret.txt)`n[ordinary link][download]`n[download]: pixel.png`n![image][photo]`n[photo]: pixel.png"
+        $Content += "`n" + '```markdown' + "`n" + '![literal](pixel.png)' + "`n" + '```' + "`n" + '`![inline](pixel.png)`'
         $Html = New-HTML -Online { New-HTMLMarkdown -Content $Content -ImageBase $Source }
         $Html | Should -Match '\[download\]: pixel.png'
         $Html | Should -Match 'secret.txt'
-        $Html | Should -Match '\[photo\]: data:image/png;base64,'
+        $Html | Should -Match 'data:image/png;base64,'
+        $Match = [regex]::Match($Html, 'let text\w+ = (.+);')
+        ($Match.Groups[1].Value | ConvertFrom-Json) | Should -Be ($Content + "`n")
     }
 
     It 'styles merged titles and column names independently' {

From aeeb80e58e8c07ed021196dab3c16ac4efa1ab78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20K=C5=82ys?= <przemyslaw.klys@evotec.pl>
Date: Sat, 3 Oct 2026 21:38:45 +0200
Subject: [PATCH 3/4] Preserve case-sensitive Markdown image references

---
 Private/Get-HTMLMarkdownImageMap.ps1 |  2 +-
 Tests/ReportCorrectness.Tests.ps1    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Private/Get-HTMLMarkdownImageMap.ps1 b/Private/Get-HTMLMarkdownImageMap.ps1
index 96a2c8d3..1d8620e2 100644
--- a/Private/Get-HTMLMarkdownImageMap.ps1
+++ b/Private/Get-HTMLMarkdownImageMap.ps1
@@ -14,7 +14,7 @@
     # Collect candidate URLs without rewriting Markdown; Showdown identifies
     # rendered images separately from code samples and escaped syntax.
     $Pattern = '(?<Prefix>!\[[^\]]*\]\(\s*|(?m:^\s*\[[^\]]+\]:\s*))(?<Path><[^>]+>|(?:[^()\s]|\((?<Depth>)|\)(?<-Depth>))+)(?(Depth)(?!))'
-    $Images = @{}
+    $Images = [System.Collections.Generic.Dictionary[string, string]]::new([StringComparer]::Ordinal)
     foreach ($Match in [regex]::Matches($Content, $Pattern)) {
         if (-not $Match.Groups['Prefix'].Value.StartsWith('!')) {
             $Reference = [regex]::Match($Match.Groups['Prefix'].Value, '\[([^\]]+)\]').Groups[1].Value
diff --git a/Tests/ReportCorrectness.Tests.ps1 b/Tests/ReportCorrectness.Tests.ps1
index 621c9f83..f13bd7f0 100644
--- a/Tests/ReportCorrectness.Tests.ps1
+++ b/Tests/ReportCorrectness.Tests.ps1
@@ -127,4 +127,21 @@ Describe 'Portable content and column presentation' {
         $Html | Should -Match '<th style="text-align:right">Name</th>'
         $Html | Should -Match '<th style="text-align:right">Value</th>'
     }
+
+    It 'embeds image references whose URLs differ only by case' {
+        $Source = Join-Path $TestDrive 'case-images'
+        $null = New-Item -ItemType Directory -Path $Source
+        $Bytes = [Convert]::FromBase64String('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+j/XcAAAAASUVORK5CYII=')
+        [IO.File]::WriteAllBytes((Join-Path $Source 'pixel.png'), $Bytes)
+        [IO.File]::WriteAllBytes((Join-Path $Source 'Pixel.png'), [byte[]]@($Bytes + 0))
+        $Html = New-HTML -Online { New-HTMLMarkdown -Content '![one](pixel.png) ![two](Pixel.png)' -ImageBase $Source }
+        $Map = [regex]::Match($Html, 'var imagestext\w+ = (.+);').Groups[1].Value
+        $Map.Contains('"pixel.png":"data:image/png;base64,') | Should -BeTrue
+        $Map.Contains('"Pixel.png":"data:image/png;base64,') | Should -BeTrue
+        # Linux has distinct files; Windows resolves both URLs to the same file.
+        foreach ($Name in 'pixel.png', 'Pixel.png') {
+            $Encoded = [Convert]::ToBase64String([IO.File]::ReadAllBytes((Join-Path $Source $Name)))
+            $Map.Contains('"' + $Name + '":"data:image/png;base64,' + $Encoded + '"') | Should -BeTrue
+        }
+    }
 }

From 74372606f492224fb0b4ffe2ed6a4628e6114b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20K=C5=82ys?= <przemyslaw.klys@evotec.pl>
Date: Sat, 3 Oct 2026 21:47:04 +0200
Subject: [PATCH 4/4] Honor PowerShell casing for export scope values

---
 Resources/JS/pswritehtml-table-export.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Resources/JS/pswritehtml-table-export.js b/Resources/JS/pswritehtml-table-export.js
index 2f2898be..8c2b9e41 100644
--- a/Resources/JS/pswritehtml-table-export.js
+++ b/Resources/JS/pswritehtml-table-export.js
@@ -1,15 +1,16 @@
 // PSWriteHTML policy around the pinned DataTables Buttons implementation.
 function pswhConfigureExport(config, scope) {
+    scope = String(scope || 'Automatic').toLowerCase();
     var textColumns = config.pswhTextColumns || [];
     var rawCsv = !!config.pswhRawData;
     delete config.pswhTextColumns;
     delete config.pswhRawData;
     var options = config.exportOptions = config.exportOptions || {};
     var modifier = options.modifier = options.modifier || {};
-    if (scope === 'All' || scope === 'Filtered') {
+    if (scope === 'all' || scope === 'filtered') {
         modifier.selected = null;
-        modifier.search = scope === 'All' ? 'none' : 'applied';
-    } else if (scope === 'Selected') {
+        modifier.search = scope === 'all' ? 'none' : 'applied';
+    } else if (scope === 'selected') {
         modifier.selected = true;
         modifier.search = 'applied';
     }