Updates trap_visit already exists check & adds uid

[Hunner4D]

Note:

Devices that have entries stored locally before this update will need to be cleared