Join the mapping to upload events (fixes #266)