Make map names consistent with coordinate scheme

Also fixed crashing when a blank map is requested