search_users
merge with search users branch and resolve conflicts