Add sorting of advisories
Use different replace string in template, remember advisory software type, add some error handling