Fix problem with non-persistent locations and contacts in add/update event