fixing usersearch forks
Fixing usersearch forking