Add location id to event
little fixes