Trying to remove duplicate calls to map services