Fix admin & supervisor search permission

EV-169

If an admin user was also a supervisor, the search permissions used
the supervisor permissions to limit the search scope.