Revert "Revert "Added  user based auto search""

This reverts commit a9229ead1620e67a2f50c05638d786acb8cd1ac8.