Better handling of link extraction