Improve linking in table.