diff --git a/samy.ps1 b/samy.ps1
index a3e19e7..d9266f6 100644
--- a/samy.ps1
+++ b/samy.ps1
@@ -694,13 +694,6 @@ function Get-SamyTasks {
             if ($t.PSObject.Properties.Name -contains 'Tooltip') { $tooltip = [string]$t.Tooltip }
             if ([string]::IsNullOrWhiteSpace($tooltip)) { $tooltip = [string]$t.Label }
 
-            # Escape for HTML attribute
-            $tooltip = $tooltip -replace '&','&'
-            $tooltip = $tooltip -replace "'",'''
-            $tooltip = $tooltip -replace '"','"'
-            $tooltip = $tooltip -replace '<','&lt;'
-            $tooltip = $tooltip -replace '>','&gt;'
-
             if ($t.PSObject.Properties.Name -contains 'Tooltip') {
                 $t.Tooltip = $tooltip
             } else {
@@ -809,8 +802,9 @@ if (-not $Global:SamyTasks) {
             $subHtml = (
                 $_.SubOptions |
                 ForEach-Object {
+                     $subLabel = Escape-HtmlText ([string]$_.Label)
                     "<label style='margin-left:20px; display:block;'>
-                    <input type='checkbox' class='sub-option-$taskId' name='$($_.Value)' value='$($_.Value)'> $($_.Label)
+                    <input type='checkbox' class='sub-option-$taskId' name='$($_.Value)' value='$($_.Value)'> $subLabel
                     </label>"
                 }
             ) -join "`n"