Maps - performance tune-up (phase 1 - wip)

Cleaned up the label