moved id setting out of the property setting loop so it always happens before uuids to resolve are recorded