more map performance improvements

3 jobs for development in 1 minute and 42 seconds (queued for 1 second)