Improved map note perf.