Improved the way the search-result list is populated.