fix search bar and messages order