Map API call fixes