Fixed scalling bug when refreshing map
Added more analytics