mv map loading to asynchronous mode
little clean on last commit