Fix intermediate point issue
Align map/text/icon scale