Improved map loading behaviour