diff --git a/config/default/common/config/wv.json/layers/aeronet/AERONET_ANGSTROM_440-870NM.json b/config/default/common/config/wv.json/layers/aeronet/AERONET_ANGSTROM_440-870NM.json
index 25def2cb44..218f0f88f8 100644
--- a/config/default/common/config/wv.json/layers/aeronet/AERONET_ANGSTROM_440-870NM.json
+++ b/config/default/common/config/wv.json/layers/aeronet/AERONET_ANGSTROM_440-870NM.json
@@ -22,7 +22,7 @@
           "dateInterval": "60"
         }
       ],
-      "wrapX": true,
+      "wrapX": false,
       "projections": {
         "geographic": {
           "source": "AERONET"
diff --git a/config/default/common/config/wv.json/layers/aeronet/AERONET_AOD_500NM.json b/config/default/common/config/wv.json/layers/aeronet/AERONET_AOD_500NM.json
index de01568951..3fcc09e18f 100644
--- a/config/default/common/config/wv.json/layers/aeronet/AERONET_AOD_500NM.json
+++ b/config/default/common/config/wv.json/layers/aeronet/AERONET_AOD_500NM.json
@@ -22,7 +22,7 @@
           "dateInterval": "60"
         }
       ],
-      "wrapX": true,
+      "wrapX": false,
       "projections": {
         "geographic": {
           "source": "AERONET"
diff --git a/config/default/common/config/wv.json/layers/aeronet/DAILY_AERONET_ANGSTROM_440-870NM.json b/config/default/common/config/wv.json/layers/aeronet/DAILY_AERONET_ANGSTROM_440-870NM.json
index 1ac9145c31..ccdff0e757 100644
--- a/config/default/common/config/wv.json/layers/aeronet/DAILY_AERONET_ANGSTROM_440-870NM.json
+++ b/config/default/common/config/wv.json/layers/aeronet/DAILY_AERONET_ANGSTROM_440-870NM.json
@@ -14,7 +14,7 @@
       "vectorStyle": {
         "id": "DAILY_AERONET_ANGSTROM_440-870NM"
       },
-      "wrapX": true,
+      "wrapX": false,
       "projections": {
         "geographic": {
           "source": "AERONET"
diff --git a/config/default/common/config/wv.json/layers/aeronet/DAILY_AERONET_AOD_500NM.json b/config/default/common/config/wv.json/layers/aeronet/DAILY_AERONET_AOD_500NM.json
index c66b0c0241..cd441dd0eb 100644
--- a/config/default/common/config/wv.json/layers/aeronet/DAILY_AERONET_AOD_500NM.json
+++ b/config/default/common/config/wv.json/layers/aeronet/DAILY_AERONET_AOD_500NM.json
@@ -14,7 +14,7 @@
       "vectorStyle": {
         "id": "DAILY_AERONET_AOD_500NM"
       },
-      "wrapX": true,
+      "wrapX": false,
       "projections": {
         "geographic": {
           "source": "AERONET"
diff --git a/web/js/map/layerbuilder.js b/web/js/map/layerbuilder.js
index 01b6dedcac..02612ce5fe 100644
--- a/web/js/map/layerbuilder.js
+++ b/web/js/map/layerbuilder.js
@@ -576,7 +576,7 @@ export default function mapLayerBuilder(config, cache, store) {
             for (let j = 0; j < split2.length; j += 1) {
               rowObj[key[j]] = split2[j];
             }
-            if (!!rowObj.AERONET_Site_Name && rowObj.AERONET_Site_Name !== '' && !takenNamesActive[rowObj.AERONET_Site_Name]) {
+            if (!!rowObj.AERONET_Site_Name && rowObj.AERONET_Site_Name !== '' && !takenNamesActive[rowObj.AERONET_Site_Name] && parseInt(rowObj['Date(dd:mm:yyyy)'].split(':')[0], 10) === date.getUTCDate()) {
               featuresObj[rowObj.AERONET_Site_Name] = {};
               featuresObj[rowObj.AERONET_Site_Name].type = 'Feature';
               featuresObj[rowObj.AERONET_Site_Name].geometry = { type: 'Point' };