Apply links to the search results

Also updated the markup to that more recently provided by @alexwllms.

These covers all the potential types that we might receive from the content service to the best of my knowledge, but update if there are others.