fix maps loading bug, reduce unusefull map api loads
moving to production