Refactored UserSearch, added local user search