Added error messages into the result
Removed redundant links and "link to" text