Improved map loading speed and fallback