[CHORE] Tweaks map API call