diff --git a/html/Admin/Elements/SelectCustomFieldLookupType b/html/Admin/Elements/SelectCustomFieldLookupType
index f3e970b..51c6835 100644
--- a/html/Admin/Elements/SelectCustomFieldLookupType
+++ b/html/Admin/Elements/SelectCustomFieldLookupType
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <select NAME ="<%$Name%>">
 %for my $option ($cf->LookupTypes) {
-<option value="<%$option%>" <%defined ($Default) && ($option eq $Default) && "SELECTED"%>><% $cf->FriendlyLookupType($option) %></option>
+<option value="<%$option%>"<%defined ($Default) && ($option eq $Default) && qq[ selected="selected"] |n%>><% $cf->FriendlyLookupType($option) %></option>
 %}
 </select>
 <%INIT>
diff --git a/html/Admin/Elements/SelectCustomFieldType b/html/Admin/Elements/SelectCustomFieldType
index d1d4ed3..d1d4638 100755
--- a/html/Admin/Elements/SelectCustomFieldType
+++ b/html/Admin/Elements/SelectCustomFieldType
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <select NAME ="<%$Name%>">
 %for my $option ($cf->TypeComposites) {
-<option value="<%$option%>" <%$option eq $Default && "SELECTED"%>><% $cf->FriendlyTypeComposite($option) %></option>
+<option value="<%$option%>"<%$option eq $Default && qq[ selected="selected"] |n%>><% $cf->FriendlyTypeComposite($option) %></option>
 %}
 </select>
 <%INIT>
diff --git a/html/Admin/Elements/SelectScrip b/html/Admin/Elements/SelectScrip
index 7f1e1c7..4bf80a3 100755
--- a/html/Admin/Elements/SelectScrip
+++ b/html/Admin/Elements/SelectScrip
@@ -47,11 +47,11 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 <option value="" 
-<% $Default eq undef && 'SELECTED' %>
+<% $Default eq undef && qq[ selected="selected"] |n %>
 >-</option>
 %while  (my $Scrip = $Scrips->Next) {
 <option value="<% $Scrip->Id %>"
-<% $Scrip->Id == $Default && 'SELECTED' %>
+<% $Scrip->Id == $Default && qq[ selected="selected"] |n %>
 ><% loc($Scrip->Name) %>
 </option>
 %}
diff --git a/html/Admin/Elements/SelectScripAction b/html/Admin/Elements/SelectScripAction
index 0d24542..25048be 100755
--- a/html/Admin/Elements/SelectScripAction
+++ b/html/Admin/Elements/SelectScripAction
@@ -47,11 +47,11 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 <option value="" 
-<% ! defined $Default && 'SELECTED' %>
+<% ! defined $Default && qq[ selected="selected"] |n %>
 >-</option>
 %while  (my $ScripAction = $ScripActions->Next) {
 <option value="<%$ScripAction->Id%>"
-<% defined $Default && $ScripAction->Id == $Default && 'SELECTED' %>
+<% defined $Default && $ScripAction->Id == $Default && qq[ selected="selected"] |n %>
 ><% loc($ScripAction->Name) %>
 </option>
 %}
diff --git a/html/Admin/Elements/SelectScripCondition b/html/Admin/Elements/SelectScripCondition
index e0b71ee..e75d5c7 100755
--- a/html/Admin/Elements/SelectScripCondition
+++ b/html/Admin/Elements/SelectScripCondition
@@ -47,11 +47,11 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 <option value="" 
-<% ! defined $Default && 'SELECTED' %>
+<% ! defined $Default && qq[ selected="selected"] %>
 >-</option>
 %while  (my $ScripCondition = $ScripConditions->Next) {
 <option value="<%$ScripCondition->Id%>"
-<% defined $Default && $ScripCondition->Id == $Default && 'SELECTED' %>
+<% defined $Default && $ScripCondition->Id == $Default && qq[ selected="selected"] %>
 ><% loc($ScripCondition->Name) %>
 </option>
 %}
diff --git a/html/Admin/Elements/SelectSingleOrMultiple b/html/Admin/Elements/SelectSingleOrMultiple
index e53e857..287cf39 100755
--- a/html/Admin/Elements/SelectSingleOrMultiple
+++ b/html/Admin/Elements/SelectSingleOrMultiple
@@ -46,18 +46,18 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
   <select name="<%$Name%>">
-    <option value="1" <%$SingleDefault%>><&|/l&>Single</&></option>
-    <option value="0" <%$MultipleDefault%>><&|/l&>Multiple</&></option>
+    <option value="1"<%$SingleDefault|n%>><&|/l&>Single</&></option>
+    <option value="0"<%$MultipleDefault|n%>><&|/l&>Multiple</&></option>
   </select>	
 
 
 <%INIT>
 my ($SingleDefault, $MultipleDefault);
 if ($Default == 1) {
-    $SingleDefault = "SELECTED";
+    $SingleDefault = qq[ selected="selected"];
 }
 elsif ($Default == 0 ) {
-    $MultipleDefault = "SELECTED";
+    $MultipleDefault = qq[ selected="selected"];
 }
 
 </%INIT>
diff --git a/html/Admin/Elements/SelectStage b/html/Admin/Elements/SelectStage
index fe89cef..6ac16d4 100644
--- a/html/Admin/Elements/SelectStage
+++ b/html/Admin/Elements/SelectStage
@@ -48,7 +48,7 @@
 <select name="<%$Name%>">
 % foreach my $stage (@stages) {
 <option value="<%$stage%>"
-<% ($stage eq $Default) && 'SELECTED' %>
+<% ($stage eq $Default) && qq[ selected="selected"] |n %>
 ><% loc($stage) %>
 </option>
 % }
diff --git a/html/Admin/Elements/SelectTemplate b/html/Admin/Elements/SelectTemplate
index 044693c..d569b13 100755
--- a/html/Admin/Elements/SelectTemplate
+++ b/html/Admin/Elements/SelectTemplate
@@ -47,17 +47,17 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 <option value="" 
-<% defined($Default) && $Default eq 'none' && 'SELECTED' %>
+<% defined($Default) && $Default eq 'none' && qq[ selected="selected"] |n %>
 >-</option>
 %while  (my $Template = $PrimaryTemplates->Next) {
 <option value="<%$Template->Id%>"
-<% ($Template->Id == $Default) && 'SELECTED' %>
+<% ($Template->Id == $Default) && qq[ selected="selected"] |n %>
 ><% loc($Template->Name) %>
 </option>
 %}
 %while  (my $Template = $OtherTemplates->Next) {
 <option value="<%$Template->Id%>"
-<% defined($Default) && ($Template->Id == $Default)  && 'SELECTED'%>
+<% defined($Default) && ($Template->Id == $Default) && qq[ selected="selected"] |n %>
 ><&|/l, loc($Template->Name) &>Global template: [_1]</&>
 </option>
 %}
diff --git a/html/Elements/EditCustomFieldSelect b/html/Elements/EditCustomFieldSelect
index 560d4c6..c173f08 100644
--- a/html/Elements/EditCustomFieldSelect
+++ b/html/Elements/EditCustomFieldSelect
@@ -56,7 +56,7 @@
 <script type="text/javascript" src="<%RT->Config->Get('WebPath')%>/NoAuth/js/cascaded.js"></script>
 %#      XXX - Hide this select from w3m?
       <select onchange="filter_cascade('<% $id %>-Values', this.value)" name="<% $id %>-Category">
-        <option value="" <% !$selected && 'selected' %>><&|/l&>-</&></option>
+        <option value=""<% !$selected && qq[ selected="selected"] |n %>><&|/l&>-</&></option>
 %           foreach my $cat (@category) {
 %               my ($depth, $name) = @$cat;
         <option value="<% $name %>"><% '&nbsp;' x $depth |n %><% $name %></option>
@@ -67,8 +67,8 @@
 %       if ( $Rows && ( $Multiple || !@category ) ) {
         size="<% $Rows %>"
 %       }
-        <% $Multiple && 'multiple' %> >
-        <option value="" <% !$selected && 'SELECTED' %>><&|/l&>(no value)</&></option>
+        <% $Multiple && qq[multiple="multiple"] |n %> >
+        <option value=""<% !$selected && qq[ selected="selected"] |n %>><&|/l&>(no value)</&></option>
 %       $m->out($out);
       </select>
 <%ARGS>
diff --git a/html/Elements/SelectLang b/html/Elements/SelectLang
index 92d8191..9cb03aa 100755
--- a/html/Elements/SelectLang
+++ b/html/Elements/SelectLang
@@ -50,7 +50,7 @@
 <option value="">-</option>
 % }
 % foreach my $lang (@lang) {
-<option value="<%$lang%>" <%(defined($Default) && ($lang eq $Default)) && 'SELECTED'%>><% $lang_to_desc{$lang} %>
+<option value="<%$lang%>"<%(defined($Default) && ($lang eq $Default)) && qq[ selected="selected"] |n%>><% $lang_to_desc{$lang} %>
 %   if (($Verbose) and (my $description = I18N::LangTags::List::native_name($lang)) ){
 (<%$description%>)
 %   }
diff --git a/html/Elements/SelectMatch b/html/Elements/SelectMatch
index dce7c37..b0fb580 100755
--- a/html/Elements/SelectMatch
+++ b/html/Elements/SelectMatch
@@ -46,10 +46,10 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <select NAME ="<%$Name%>">
-<option value="LIKE" <%$LikeDefault%>><%$Like%></option>
-<option value="NOT LIKE" <%$NotLikeDefault%>><%$NotLike%></option>
-<option value="=" <%$TrueDefault%>><%$True%></option>
-<option value="!=" <%$FalseDefault%>><%$False%></option>
+<option value="LIKE"<%$LikeDefault|n%>><%$Like%></option>
+<option value="NOT LIKE"<%$NotLikeDefault|n%>><%$NotLike%></option>
+<option value="="<%$TrueDefault|n%>><%$True%></option>
+<option value="!="<%$FalseDefault|n%>><%$False%></option>
 </select>
 
 <%ARGS>
@@ -68,15 +68,15 @@ my $LikeDefault='';
 my $NotLikeDefault ='';
 
 if ($Default && $Default =~ /false/i) {
-	$FalseDefault = "SELECTED";
+	$FalseDefault = qq[ selected="selected"];
 }
 elsif ($Default && $Default =~ /true/i) {
-	$TrueDefault = "SELECTED";
+	$TrueDefault = qq[ selected="selected"];
 } 
 elsif ($Default && $Default =~ /notlike/i) {
-	$NotLikeDefault = "SELECTED";
+	$NotLikeDefault = qq[ selected="selected"];
 }
 else {
-	$LikeDefault = "SELECTED";
+	$LikeDefault = qq[ selected="selected"];
 }
 </%INIT>
diff --git a/html/Elements/SelectOwner b/html/Elements/SelectOwner
index 0df44f8..7c83c34 100755
--- a/html/Elements/SelectOwner
+++ b/html/Elements/SelectOwner
@@ -47,11 +47,11 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 %if ($DefaultValue) {
-<option <% !$Default ? "SELECTED" : '' %> value=""><%$DefaultLabel%></option>
+<option value=""<% !$Default ? qq[ selected="selected"] : '' |n %>><%$DefaultLabel%></option>
 %}
 % $Default = 0 unless defined $Default && $Default =~ /^\d+$/;
 %foreach my $User ( @users)  {
-<option <% ( $User->Id == $Default) ? "SELECTED" : ''%>
+<option <% ( $User->Id == $Default) ? qq[ selected="selected"] : '' |n %>
 %if ($ValueAttribute eq 'id') {
     value="<%$User->id%>"
 %} elsif ($ValueAttribute eq 'Name') {
diff --git a/html/Elements/SelectSortOrder b/html/Elements/SelectSortOrder
index 528696e..2bd2b93 100755
--- a/html/Elements/SelectSortOrder
+++ b/html/Elements/SelectSortOrder
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 %foreach my $order (@orders) {
-<option value="<%$order%>" <%$order eq $Default && 'SELECTED' %>>
+<option value="<%$order%>"<%$order eq $Default && qq[ selected="selected"] |n %>>
 <% shift @order_names %>
 </option>
 % }
diff --git a/html/Elements/SelectStatus b/html/Elements/SelectStatus
index 018cdf4..6d4d5d6 100755
--- a/html/Elements/SelectStatus
+++ b/html/Elements/SelectStatus
@@ -47,11 +47,11 @@
 %# END BPS TAGGED BLOCK }}}
 <select NAME ="<%$Name%>">
 %if ($DefaultValue) {
-<option <% !$Default && "SELECTED" %> value=""><%$DefaultLabel%></option>
+<option value=""<% !$Default && qq[ selected="selected"] |n %>><%$DefaultLabel%></option>
 %}
 %foreach my $status (@status) {
 %next if ($SkipDeleted && $status eq 'deleted');
-<option <% (defined $Default &&  $status eq $Default) && "SELECTED" %> value="<%$status%>"><%loc($status)%></option>
+<option value="<%$status%>"<% (defined $Default && $status eq $Default) && qq[ selected="selected"] |n %>><%loc($status)%></option>
 % }
 </select>
 <%ONCE>
diff --git a/html/Elements/SelectTicketSortBy b/html/Elements/SelectTicketSortBy
index bd2f6be..4a07b68 100755
--- a/html/Elements/SelectTicketSortBy
+++ b/html/Elements/SelectTicketSortBy
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 % foreach my $field (@sortfields) {
-<option value="<%$field%>" <% $field eq $Default && 'SELECTED'%>><% loc($field) %></option>
+<option value="<%$field%>"<% $field eq $Default && qq[ selected="selected"] |n%>><% loc($field) %></option>
 % }
 </select>
 
diff --git a/html/Elements/SelectTicketTypes b/html/Elements/SelectTicketTypes
index 134374a..8148a32 100755
--- a/html/Elements/SelectTicketTypes
+++ b/html/Elements/SelectTicketTypes
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 %foreach (@Types) {
-<option value="<% $_ %>" <% ($_ eq $Default) && "SELECTED" %>><&|/l&><% $_ %></&>
+<option value="<% $_ %>"<% ($_ eq $Default) && qq[ selected="selected"] |n %>><&|/l&><% $_ %></&>
 %}
 </select>
 
diff --git a/html/Elements/SelectWatcherType b/html/Elements/SelectWatcherType
index 33268af..c2dd6e9 100755
--- a/html/Elements/SelectWatcherType
+++ b/html/Elements/SelectWatcherType
@@ -50,7 +50,7 @@
 <option value="">-</option>
 % }
 %for my $option (@types) {
-<option value="<%$option%>" <%defined($Default) && $option eq $Default && "SELECTED"%>><%loc($option)%></option>
+<option value="<%$option%>"<%defined($Default) && $option eq $Default && qq[ selected="selected"] |n %>><%loc($option)%></option>
 %}
 </select>
 
diff --git a/html/Search/Elements/SelectChartType b/html/Search/Elements/SelectChartType
index ee82374..20de764 100644
--- a/html/Search/Elements/SelectChartType
+++ b/html/Search/Elements/SelectChartType
@@ -51,6 +51,6 @@ $Default => 'bar'
 </%args>
 <select name="<%$Name%>">
 % foreach my $option qw(bar pie) {
-<option value="<%$option%>" <% $option eq $Default ? 'SELECTED' : '' %>><%loc($option)%></option>
+<option value="<%$option%>"<% $option eq $Default ? qq[ selected="selected"] : '' |n %>><%loc($option)%></option>
 % }
 </select>
diff --git a/html/Search/Elements/SelectGroup b/html/Search/Elements/SelectGroup
index 8bd5f84..dcf5158 100644
--- a/html/Search/Elements/SelectGroup
+++ b/html/Search/Elements/SelectGroup
@@ -50,7 +50,7 @@
 <option value="">-</option>
 % }
 %while (my $group = $groups->Next) {
-<option value="<%$group->id%>" <%$group->id eq $Default && "SELECTED"%>><%$group->Name%></option>
+<option value="<%$group->id%>"<%$group->id eq $Default && qq[ selected="selected"] |n %>><%$group->Name%></option>
 %}
 </select>
 
diff --git a/html/Search/Elements/SelectPersonType b/html/Search/Elements/SelectPersonType
index eb606cd..d7f5bb6 100644
--- a/html/Search/Elements/SelectPersonType
+++ b/html/Search/Elements/SelectPersonType
@@ -51,11 +51,11 @@
 % }
 % for my $option (@types) {
 %  if ($Suffix) {
-<option value="<% $option %><% $Suffix %>" <%$option eq $Default && "SELECTED"%> ><%loc($option)%></option>
+<option value="<% $option %><% $Suffix %>"<%$option eq $Default && qq[ selected="selected"] |n %> ><%loc($option)%></option>
 %   next;
 %  }
 %  foreach my $subtype (@subtypes) {
-<option value="<%"$option.$subtype"%>" <%$option eq $Default && $subtype eq 'EmailAddress' && "SELECTED"%> ><% loc($option) %> <% loc($subtype) %></option>
+<option value="<%"$option.$subtype"%>"<%$option eq $Default && $subtype eq 'EmailAddress' && qq[ selected="selected"] |n %> ><% loc($option) %> <% loc($subtype) %></option>
 %  }
 % }
 </select>
diff --git a/html/Ticket/Elements/ShowDates b/html/Ticket/Elements/ShowDates
index 2aa85e1..6697870 100755
--- a/html/Ticket/Elements/ShowDates
+++ b/html/Ticket/Elements/ShowDates
@@ -79,7 +79,7 @@
     <td class="label date updated"><&|/l&>Updated</&>:</td>
 % my $UpdatedString = $Ticket->LastUpdated ? loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name) : loc("Never");
 % if ($UpdatedLink) {
-    <td class="value date updated"><A HREF="#lasttrans"><% $UpdatedString | h %></a></td>
+    <td class="value date updated"><a href="#lasttrans"><% $UpdatedString | h %></a></td>
 % } else {
     <td class="value date updated"><% $UpdatedString | h %></td>
 % }
diff --git a/html/Ticket/Update.html b/html/Ticket/Update.html
index 9bb459c..cffa0cc 100755
--- a/html/Ticket/Update.html
+++ b/html/Ticket/Update.html
@@ -86,10 +86,10 @@
 <tr><td align="right"><&|/l&>Update Type</&>:</td>
 <td><select name="UpdateType">
 % if ($CanComment) {
-<option value="private" <% ($ARGS{'UpdateType'} &&  $ARGS{'UpdateType'} eq "private") ? "SELECTED" : !$ARGS{'UpdateType'}&&$CommentDefault%>><&|/l&>Comments (Not sent to requestors)</&></option>
+<option value="private"<% ($ARGS{'UpdateType'} &&  $ARGS{'UpdateType'} eq "private") ? qq[ selected="selected"] : !$ARGS{'UpdateType'}&&$CommentDefault |n %>><&|/l&>Comments (Not sent to requestors)</&></option>
 % }
 % if ($CanRespond) {
-<option value="response" <% ($ARGS{'UpdateType'} && $ARGS{'UpdateType'} eq "response") ? "SELECTED" : !$ARGS{'UpdateType'}&&$ResponseDefault%>><&|/l&>Reply to requestors</&></option>
+<option value="response"<% ($ARGS{'UpdateType'} && $ARGS{'UpdateType'} eq "response") ? qq[ selected="selected"] : !$ARGS{'UpdateType'}&&$ResponseDefault |n %>><&|/l&>Reply to requestors</&></option>
 % }
 </select> 
 </td></tr>
@@ -185,11 +185,11 @@ if ($DefaultStatus eq 'resolved') {
 
 my ($CommentDefault, $ResponseDefault);
 if ($Action ne 'Respond') {
-   $CommentDefault = "SELECTED"; 
+    $CommentDefault = qq[ selected="selected"]; 
     $ResponseDefault = "";
 } else {
     $CommentDefault = ""; 
-    $ResponseDefault = "SELECTED";
+    $ResponseDefault = qq[ selected="selected"];
 }
 
 
diff --git a/lib/RT/Interface/Web/QueryBuilder/Tree.pm b/lib/RT/Interface/Web/QueryBuilder/Tree.pm
index 2b17205..8c52563 100755
--- a/lib/RT/Interface/Web/QueryBuilder/Tree.pm
+++ b/lib/RT/Interface/Web/QueryBuilder/Tree.pm
@@ -139,7 +139,7 @@ sub GetQueryAndOptionList {
     my $list = $self->__LinearizeTree;
     foreach my $e( @$list ) {
         $e->{'DEPTH'}    = $e->{'NODE'}->getDepth;
-        $e->{'SELECTED'} = (grep $_ == $e->{'NODE'}, @$selected_nodes)? 'selected' : '';
+        $e->{'SELECTED'} = (grep $_ == $e->{'NODE'}, @$selected_nodes)? qq[ selected="selected"] : '';
     }
 
     return (join ' ', map $_->{'TEXT'}, @$list), $list;