%#
%#
%# END LICENSE BLOCK
-<FORM ACTION="Listing.html" METHOD="GET">
-<INPUT TYPE=HIDDEN NAME="Bookmark" VALUE="<% $session{'tickets'}->FreezeLimits()|u %>">
+<FORM ACTION="<%$RT::WebPath%>/Search/Listing.html" METHOD="GET">
+<INPUT TYPE=HIDDEN NAME="Bookmark" VALUE="<% $session{'tickets'}->FreezeLimits()%>">
<& /Elements/TitleBoxStart, title => loc('Refine search')&>
<INPUT TYPE=HIDDEN NAME="CompileRestriction" VALUE=1>
<& /Elements/SelectOwner, Name => "ValueOfOwner" &>
<li>
-<&|/l&>Requestor email address</&>
-<& /Elements/SelectMatch, Name => "RequestorOp" &>
-<INPUT Name="ValueOfRequestor" SIZE=20>
+<& /Elements/SelectWatcherType, Name => "WatcherRole", AllowNull => 0 &>
+<&|/l&>email address</&>
+<& /Elements/SelectMatch, Name => "WatcherRoleOp" &>
+<INPUT Name="ValueOfWatcherRole" SIZE=20>
<li>
<&|/l&>Subject</&> <& /Elements/SelectMatch, Name => "SubjectOp" &>
False => loc("isn't"),
TrueVal=> '=',
FalseVal => '!=' &>
-<& /Elements/SelectQueue, Name => loc("ValueOfQueue") &>
+<& /Elements/SelectQueue, Name => "ValueOfQueue" &>
<li><&|/l&>Priority</&> <& /Elements/SelectEqualityOperator, Name => "PriorityOp" &>
TrueVal=> '=',
FalseVal => '!='
&>
-<& /Elements/SelectStatus, Name => "ValueOfStatus" &>
+<& /Elements/SelectStatus, Name => "ValueOfStatus", SkipDeleted => 1 &>
% while ( my $CustomField = $CustomFields->Next ) {