improved the search and routes