Change parser to better recognize the end of links