[ORB-546] refined search method for users to be more sensible