more map performance improvements

3 jobs for development in 1 minute and 42 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #6214
build

00:01:31

manual #6215
allowed to fail manual
build_shopmason
 
  Deploy
passed #6216
deploy_staging

00:00:11