Add all map location and fix error