fix currentUser search