some improvements on map translation