Updated search to work with usernames