fix getting local and prod instance for DataLocationMapper

 also change to new api to get location efficiently