Index: openacs-4/packages/acs-admin/www/users/complex-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/acs-admin/www/users/complex-search.adp	27 Oct 2014 16:38:56 -0000	1.8
+++ openacs-4/packages/acs-admin/www/users/complex-search.adp	15 Jun 2015 11:10:10 -0000	1.9
@@ -24,14 +24,6 @@
 
 <hr>
 
-<ul>
-  <multiple name="user_search">
-    <li><a href="@target@?user_id=@user_search.user_id@&@user_search.export_vars@&@passthrough_parameters@">@user_search.first_names@ @user_search.last_name@ (@user_search.email@)</a>
-    <if @user_search.member_state@ ne "approved">
-       <font color="red">@user_search.member_state@</font> @user_search.user_finite_state_links;noquote@
-    </if>
-  </multiple>
-</ul>
 
 <if @user_search:rowcount@ eq 0>
   <ul>
@@ -40,16 +32,25 @@
 </if>
 <else>
 
+<ul>
+  <multiple name="user_search">
+    <li><a href="@target@?user_id=@user_search.user_id@&amp;@user_search.export_vars@&amp;@passthrough_parameters@">@user_search.first_names@ @user_search.last_name@ (@user_search.email@)</a>
+    <if @user_search.member_state@ ne "approved">
+       <span style="color:red">@user_search.member_state@</span> @user_search.user_finite_state_links;noquote@
+    </if>
+  </multiple>
+</ul>
+
   <if @user_search:rowcount@ gt 30>
 
     <if @only_authorized_p@ eq 0>
       <p>
-        We're showing all users, authorized or not (<a href="complex-search?@export_authorize@&only_authorized_p=1">
+        We're showing all users, authorized or not (<a href="complex-search?@export_authorize@&amp;only_authorized_p=1">
         show only authorized</a>).
       <p>
     </if><else>
       <p>
-        We're only showing authorized users (<a href="complex-search?@export_authorize@&only_authorized_p=0">show all</a>).
+        We're only showing authorized users (<a href="complex-search?@export_authorize@&amp;only_authorized_p=0">show all</a>).
       <p>
     </else>