Added country info and changed find user to using FB id