Minor improvement of map drawing