#1571 Some geo lookup tweaks to support fallback