diff --git a/public/js/map.js b/public/js/map.js
index eeeafe9..04bf9e5 100644
--- a/public/js/map.js
+++ b/public/js/map.js
@@ -14,6 +14,7 @@ var layer;
 var layers = Array();
 var defaultZoom = 13;
 var rightCoords = [];
+var allPointsLoaded = false;
 
 categories.im = L.icon({
 	iconUrl: '/ico/man.png',
@@ -198,16 +199,11 @@ function initPoints(useBounds)
 		success: function (data) {
 			for(var i=0; i<data.length; i++) {
 				if (typeof points[data[i].id] == 'undefined') {
-//					if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25 || data[i]['categoryId'] == 26 || data[i]['categoryId'] == 27) {
-//						console.log(data[i]);
-//						markersPlus.addLayer(constructPoint(data[i]));
-//					} else {
-						markers.addLayer(constructPoint(data[i]));
-//					}
+					markers.addLayer(constructPoint(data[i]));
 				}
 			}
 			myMap.addLayer(markers);
-//			myMap.addLayer(markersPlus);
+			allPointsLoaded = bounds == 0;
 
 			if (getURLParameter('point') != 'null')
 			{
@@ -242,6 +238,10 @@ function initPoints(useBounds)
 
 function loadPointsInBounds()
 {
+	if (allPointsLoaded) {
+		return true;
+	}
+
 	bounds = myMap.getBounds();
 	bounds = Array(bounds._northEast.lat,bounds._northEast.lng,bounds._southWest.lat,bounds._southWest.lng)
 
@@ -253,15 +253,10 @@ function loadPointsInBounds()
 		success: function (data) {
 			for(var i=0; i < data.length; i++) {
 				if (typeof points[data[i].id] == 'undefined') {
-//					if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25) {
-//						markersPlus.addLayer(constructPoint(data[i]));
-//					} else {
-						markers.addLayer(constructPoint(data[i]));
-//					}
+					markers.addLayer(constructPoint(data[i]));
 				}
 			}
 			myMap.addLayer(markers);
-//			myMap.addLayer(markersPlus);
 		}
 	});