Adding logic for callouts that lack @id attributes