Few more minor places where we reference a document's unique key as 'id'.