Rework on search bar.