Fixed issue with mapviewer