Add better user searching functionality