Fixing join contact functionality, including search

Change-Id: I3fe1f6270175cbdd13448c1adecbad1ee96d2fac
9 files changed