ParserService: better parsing of links