fixed problems with new map management