Some fix on map general view