Added links to search results, and made it straightforward to improve