Efficiency improvements, map will remain locked on a marker if refresh changes its position