Improved style and fixed the search.