Improve zoom auto for map and prepare remove map. #1594 #1701