Improved drawing of points on map
Add limit option to server side