-[% IF opts.searchon == "names" && non_results %]
-<p>[% g('<a href="%s">%u</a> results have not been displayed due to the search parameters.',
- "$search_url$keyword_esc", non_results) %]</p>
+
+<p>[% g('Limit to suite:') %]
+[% FOREACH s IN all_suites %]
+ [% IF s != suite_str %]
+ [<a href="[% make_search_url('',"keywords=$keyword_esc",'suite',s) %]">[% s %]</a>]
+ [% ELSE %]
+ [[% s %]]
+ [% END %]
+[% END %]
+[% IF search_suites.size == 1 %]
+<p>[% g('Search in <a href="%s">all suites</a>',
+ make_search_url('',"keywords=$keyword_esc",'suite','all')) %]
+[% END %]
+
+<p>[% g('Limit to a architecture:') %]
+[% FOREACH a IN all_architectures %]
+ [% IF a != arch_str %]
+ [<a href="[% make_search_url('',"keywords=$keyword_esc",'arch',a) %]">[% a %]</a>]
+ [% ELSE %]
+ [[% a %]]
+ [% END %]
+[% END %]
+[% IF search_architectures.size == 1 %]
+<p>[% g('Search in <a href="%s">all architectures</a>',
+ make_search_url('',"keywords=$keyword_esc",'arch','any')) %]