fix: ensure map async calls done
fix regressions: map-edit and user contribs
refactor events