Some fixes and improvement on the search bar