Link insert and update are now more tolerant