JFG-579 improved the search bar