Handling to preserve @id attributes on table entries