Link parsing improved