improve search functionality + remove useless addUser in orderManager