Improvement on search bar