Switched to new format and added links to result page.