diff --git a/packages/geoview-core/public/templates/demos/demo-function-event.html b/packages/geoview-core/public/templates/demos/demo-function-event.html
index cb7ddd1fbc8..dc1f10f9cb0 100644
--- a/packages/geoview-core/public/templates/demos/demo-function-event.html
+++ b/packages/geoview-core/public/templates/demos/demo-function-event.html
@@ -203,11 +203,49 @@ <h3>Events that will generate notifications:</h3>
     <script src="codedoc.js"></script>
     <script src="layerlib.js"></script>
     <script>
-      // initialize cgpv and api events, a callback is optional, used if calling api's after the rendering is ready
-      cgpv.init(async (mapId) => {
-          listenToLegendLayerSetChanges('HMap1-state', 'Map1');
+      const LYR_PATH_UNIQUE = "uniqueValueId/1";
+      const LYR_PATH_NON_METAL = "nonmetalmines/5";
+      const LYR_PATH_FEATURE = "esriFeatureLYR5/0";
+      const LYR_PATH_GEOCORE = "f4c51eaa-a6ca-48b9-a1fc-b0651da20509";
+
+      // Register a handler when the map is init
+      cgpv.onMapInit((mapId) => {
+        // !!
+        // GV This callback is executed when map is init, but map isn't ready nor layers registered
+        // !!
+
+        listenToLegendLayerSetChanges('HMap1-state', 'Map1');
+
+        // listen to map language changed event
+        cgpv.api.maps.Map1.onMapLanguageChanged((sender, payload) => {
+          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Map language changed to ${payload.language}`);
+        });
+
+        // listen to basemap changed event
+        cgpv.api.maps.Map1.basemap.onBasemapChanged((sender, payload) => {
+          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Basemap changed to ${payload.basemap.basemapId}`);
+        });
+
+        // listen to layer reordered event
+        cgpv.api.maps.Map1.stateApi.onLayersReordered((sender, payload) => {
+          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Layers reordered to ${payload.orderedLayers.map((layer) => layer.layerPath)}`);
+        });
+
+        // listen to map added to div event
+        cgpv.api.onMapAddedToDiv((sender, payload) => {
+          cgpv.api.maps[payload.mapId].notifications.addNotificationSuccess(`Map ${payload.mapId} added`);
+        });
+
+        // listen to map zoom event
+        cgpv.api.maps.Map1.onMapZoomEnd((sender, payload) => {
+          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Zoomed to level ${payload.zoom}`);
+        });
+
+        // listen to map move event
+        cgpv.api.maps.Map1.onMapMoveEnd((sender, payload) => {
+          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Map moved to center latitude ${payload.lnglat[1]} and longitude ${payload.lnglat[0]}`);
+        });
 
-        // Events=====================================================================================================================
         // listen to layer added event
         cgpv.api.maps.Map1.layer.onLayerAdded((sender, payload) => {
           cgpv.api.maps.Map1.notifications.addNotificationSuccess(payload.layer.geoviewLayerId + ' added');
@@ -220,31 +258,15 @@ <h3>Events that will generate notifications:</h3>
 
         // listen to layer error events
         cgpv.api.maps.Map1.layer.onLayerError((sender, payload) => {
-          // NOTE: The event added layer will be trigger first as the layer, even in error, has been added to ui 
+          // NOTE: The event added layer will be trigger first as the layer, even in error, has been added to ui
           cgpv.api.maps.Map1.notifications.addNotificationError(payload.layerPath + ' error');
         });
 
-        // listen to individual layer loaded event
-        cgpv.api.maps.Map1.layer.getGeoviewLayer('nonmetalmines/5').onIndividualLayerLoaded((sender, payload) => {
-          cgpv.api.maps.Map1.notifications.addNotificationSuccess('Nonmetal mines has finished loading');
-          console.log(sender.olRootLayer.getSource().getFeatures());
-        });
-
         // listen to layer removed event
         cgpv.api.maps.Map1.layer.onLayerRemoved((sender, payload) => {
           cgpv.api.maps.Map1.notifications.addNotificationSuccess(payload.layerPath + ' removed');
         });
 
-        // listen to layer visibility changed event (individual geoview layer)
-        cgpv.api.maps.Map1.layer.getGeoviewLayer('uniqueValueId/1').onVisibleChanged((sender, payload) => {
-          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`uniqueValueId/1 visibility set to ${payload.visible} - individual`);
-        });
-
-        // listen to layer visibility changed event (individual geoview layer)
-        cgpv.api.maps.Map1.layer.getGeoviewLayer('f4c51eaa-a6ca-48b9-a1fc-b0651da20509').onVisibleChanged((sender, payload) => {
-          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`layer ${payload.layerPath} visibility set to ${payload.visible} - individual`);
-        });
-
         // listen to layer item visibility changed event (any layers)
         cgpv.api.maps.Map1.layer.onLayerVisibilityToggled((sender, payload) => {
           cgpv.api.maps.Map1.notifications.addNotificationSuccess(`layer ${payload.layerPath} visibility set to ${payload.visibility} - global`);
@@ -255,51 +277,84 @@ <h3>Events that will generate notifications:</h3>
           cgpv.api.maps.Map1.notifications.addNotificationSuccess(`${payload.itemName} on layer ${payload.layerPath} visibility set to ${payload.visibility} - global`);
         });
 
-        // listen to map zoom event
-        cgpv.api.maps.Map1.onMapZoomEnd((sender, payload) => {
-          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Zoomed to level ${payload.zoom}`);
-        });
+        // Add more registrations of listeners when the map has been initialized here...
 
-        // listen to map move event
-        cgpv.api.maps.Map1.onMapMoveEnd((sender, payload) => {
-          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Map moved to center latitude ${payload.lnglat[1]} and longitude ${payload.lnglat[0]}`);
-        });
+      });
+
+      // Register a handler when the map is ready
+      cgpv.onMapReady((mapId) => {
+        // !!
+        // GV This callback is executed when map is ready / layers registered, but layers aren't necessarily processed
+        // !!
 
-        // listen to layer status change event
-        cgpv.api.maps.Map1.layer.getLayerEntryConfig('uniqueValueId/1').onLayerStatusChanged((sender, payload) => {
-          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`uniqueValueId/1 status changed to ${payload.layerStatus}`);
+        cgpv.api.maps.Map1.layer.getLayerEntryConfig(LYR_PATH_UNIQUE)?.onLayerStatusChanged((sender, payload) => {
+          // debugger;
+          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`${LYR_PATH_UNIQUE} status changed to ${payload.layerStatus}`);
         });
 
-        // listen to layer filter applied event
-        cgpv.api.maps.Map1.layer.getGeoviewLayerHybrid('uniqueValueId/1').onLayerFilterApplied((sender, payload) => {
-          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Filter ${payload.filter} applied to ${payload.layerPath}`);
+        cgpv.api.maps.Map1.layer.getLayerEntryConfig(LYR_PATH_GEOCORE)?.onLayerStatusChanged((sender, payload) => {
+          // debugger;
+          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`${LYR_PATH_GEOCORE} status changed to ${payload.layerStatus}`);
         });
 
-        // listen to map language changed event
-        cgpv.api.maps.Map1.onMapLanguageChanged((sender, payload) => {
-          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Map language changed to ${payload.language}`);
+        // listen to individual layer loaded event
+        cgpv.api.maps.Map1.layer.getGeoviewLayerHybrid(LYR_PATH_NON_METAL)?.onIndividualLayerLoaded((sender, payload) => {
+          cgpv.api.maps.Map1.notifications.addNotificationSuccess('Nonmetal mines has finished loading');
+          console.log(sender.olRootLayer.getSource().getFeatures());
         });
 
-        // listen to basemap changed event
-        cgpv.api.maps.Map1.basemap.onBasemapChanged((sender, payload) => {
-          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Basemap changed to ${payload.basemap.basemapId}`);
+        // Add more registrations of listeners when the map is ready / layers registered here...
+
+      });
+
+      // Register a handler when the layers are init
+      cgpv.onLayersProcessed((mapId) => {
+        // !!
+        // GV This callback is executed when map is init, but layers aren't necessarily loaded
+        // !!
+
+        // Add more registrations of listeners when the layers have been processed here...
+
+      });
+
+      // Register a handler when the layers are loaded
+      cgpv.onLayersLoaded((mapId) => {
+        // !!
+        // GV This callback is executed when all layers are loaded
+        // !!
+
+        // listen to layer visibility changed event (individual geoview layer)
+        cgpv.api.maps.Map1.layer.getGeoviewLayerHybrid(LYR_PATH_UNIQUE)?.onVisibleChanged((sender, payload) => {
+          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`${LYR_PATH_UNIQUE} visibility set to ${payload.visible} - individual`);
         });
 
-        // listen to layer reordered event
-        cgpv.api.maps.Map1.stateApi.onLayersReordered((sender, payload) => {
-          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Layers reordered to ${payload.orderedLayers.map((layer) => layer.layerPath)}`);
+        // listen to layer visibility changed event (individual geoview layer)
+        cgpv.api.maps.Map1.layer.getGeoviewLayerHybrid(LYR_PATH_GEOCORE)?.onVisibleChanged((sender, payload) => {
+          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`layer ${payload.layerPath} visibility set to ${payload.visible} - individual`);
         });
 
         // listen to layer opacity changed event
-        cgpv.api.maps.Map1.layer.getGeoviewLayer('uniqueValueId/1').onLayerOpacityChanged((sender, payload) => {
+        cgpv.api.maps.Map1.layer.getGeoviewLayerHybrid(LYR_PATH_UNIQUE)?.onLayerOpacityChanged((sender, payload) => {
           cgpv.api.maps.Map1.notifications.addNotificationSuccess(`${payload.layerPath} opacity changed to ${payload.opacity}`);
         });
 
-        // listen to map added to div event
-        cgpv.api.onMapAddedToDiv((sender, payload) => {
-          cgpv.api.maps[payload.mapId].notifications.addNotificationSuccess(`Map ${payload.mapId} added`);
+        // listen to layer filter applied event
+        cgpv.api.maps.Map1.layer.getGeoviewLayerHybrid(LYR_PATH_UNIQUE)?.onLayerFilterApplied((sender, payload) => {
+          cgpv.api.maps.Map1.notifications.addNotificationSuccess(`Filter ${payload.filter} applied to ${payload.layerPath}`);
         });
-      })
+
+        // Add more registrations of listeners when the layers have been loaded here...
+      });
+
+      // Initialize cgpv
+      cgpv.init(async (mapId) => {
+        // Obsolete callback
+        // debugger;
+      }, () => {
+        // Obsolete callback
+        // debugger;
+      });
+
       // Add WMS Button======================================================================================================
       // find the button element by ID
       var addLayerButton = document.getElementById('Add-layer');
@@ -365,7 +420,7 @@ <h3>Events that will generate notifications:</h3>
 
       // add an event listener when a button is clicked
       toggleVisibilityButton.addEventListener('click', async () => {
-        cgpv.api.maps.Map1.layer.setOrToggleLayerVisibility('esriFeatureLYR5/0');
+        cgpv.api.maps.Map1.layer.setOrToggleLayerVisibility(LYR_PATH_FEATURE);
       });
 
       // Set All Visible Button=====================================================================================================
@@ -392,7 +447,7 @@ <h3>Events that will generate notifications:</h3>
 
       // add an event listener when a button is clicked
       renameLayerButton.addEventListener('click', async () => {
-        cgpv.api.maps.Map1.layer.setLayerName('uniqueValueId/1', 'Water Quantity')
+        cgpv.api.maps.Map1.layer.setLayerName(LYR_PATH_UNIQUE, 'Water Quantity')
       });
 
       // Place Marker Button========================================================================================================
@@ -475,7 +530,7 @@ <h3>Events that will generate notifications:</h3>
 
       // add an event listener when a button is clicked
       disableHoverButton.addEventListener('click', async () => {
-        cgpv.api.maps.Map1.layer.hoverFeatureInfoLayerSet.disableHoverListener('esriFeatureLYR5/0')
+        cgpv.api.maps.Map1.layer.hoverFeatureInfoLayerSet.disableHoverListener(LYR_PATH_FEATURE)
       });
 
       // Enable hover Button========================================================================================================
@@ -484,7 +539,7 @@ <h3>Events that will generate notifications:</h3>
 
       // add an event listener when a button is clicked
       enableHoverButton.addEventListener('click', async () => {
-        cgpv.api.maps.Map1.layer.hoverFeatureInfoLayerSet.enableHoverListener('esriFeatureLYR5/0')
+        cgpv.api.maps.Map1.layer.hoverFeatureInfoLayerSet.enableHoverListener(LYR_PATH_FEATURE)
       });
 
       // Disable feature info Button=================================================================================================
@@ -493,7 +548,7 @@ <h3>Events that will generate notifications:</h3>
 
       // add an event listener when a button is clicked
       disableFeatureInfoButton.addEventListener('click', async () => {
-        cgpv.api.maps.Map1.layer.featureInfoLayerSet.disableClickListener('esriFeatureLYR5/0')
+        cgpv.api.maps.Map1.layer.featureInfoLayerSet.disableClickListener(LYR_PATH_FEATURE)
       });
 
       // Enable feature info Button==================================================================================================
@@ -502,7 +557,7 @@ <h3>Events that will generate notifications:</h3>
 
       // add an event listener when a button is clicked
       enableFeatureInfoButton.addEventListener('click', async () => {
-        cgpv.api.maps.Map1.layer.featureInfoLayerSet.enableClickListener('esriFeatureLYR5/0')
+        cgpv.api.maps.Map1.layer.featureInfoLayerSet.enableClickListener(LYR_PATH_FEATURE)
       });
 
       // Enable show collapsed state Button==========================================================================================
@@ -511,7 +566,7 @@ <h3>Events that will generate notifications:</h3>
 
       // add an event listener when a button is clicked
       showCollapsedStateButton.addEventListener('click', async () => {
-        console.log(cgpv.api.maps.Map1.stateApi.getLegendCollapsedState('uniqueValueId/1'))
+        console.log(cgpv.api.maps.Map1.stateApi.getLegendCollapsedState(LYR_PATH_UNIQUE))
       });
 
       // Enable toggle collapse state Button==========================================================================================
@@ -520,7 +575,7 @@ <h3>Events that will generate notifications:</h3>
 
       // add an event listener when a button is clicked
       toggleCollapseButton.addEventListener('click', async () => {
-        cgpv.api.maps.Map1.stateApi.setLegendCollapsedState('uniqueValueId/1')
+        cgpv.api.maps.Map1.stateApi.setLegendCollapsedState(LYR_PATH_UNIQUE)
       });
 
       // Enable show layer info Button================================================================================================
@@ -568,7 +623,7 @@ <h3>Events that will generate notifications:</h3>
 
       // add an event listener when a button is clicked
       setLayerButton.addEventListener('click', async () => {
-        cgpv.api.maps.Map1.stateApi.setSelectedLayersTabLayer('nonmetalmines/5');
+        cgpv.api.maps.Map1.stateApi.setSelectedLayersTabLayer(LYR_PATH_NON_METAL);
       });
 
       // Swiper add Button================================================================================================
@@ -577,7 +632,7 @@ <h3>Events that will generate notifications:</h3>
 
       // add an event listener when a button is clicked
       swiperAddButton.addEventListener('click', async () => {
-        cgpv.api.maps.Map1.plugins['swiper'].activateForLayer('nonmetalmines/5');
+        cgpv.api.maps.Map1.plugins['swiper'].activateForLayer(LYR_PATH_NON_METAL);
       });
 
       // Swiper remove Button================================================================================================
@@ -586,7 +641,7 @@ <h3>Events that will generate notifications:</h3>
 
       // add an event listener when a button is clicked
       swiperRemoveButton.addEventListener('click', async () => {
-        cgpv.api.maps.Map1.plugins['swiper'].deActivateForLayer('nonmetalmines/5');
+        cgpv.api.maps.Map1.plugins['swiper'].deActivateForLayer(LYR_PATH_NON_METAL);
       });
 
       // Calculate distance Button================================================================================================
@@ -682,7 +737,7 @@ <h3>Events that will generate notifications:</h3>
       zoomToMarkerGroupButton.addEventListener('click', () => {
         cgpv.api.maps.Map1.layer.featureHighlight.pointMarkers.zoomToPointMarkerGroup('group1');
       });
-  
+
       // create snippets
       window.addEventListener('load', () => {
         createCodeSnippet();
diff --git a/packages/geoview-core/src/app.tsx b/packages/geoview-core/src/app.tsx
index 6f333361c2b..cd4827befae 100644
--- a/packages/geoview-core/src/app.tsx
+++ b/packages/geoview-core/src/app.tsx
@@ -32,6 +32,11 @@ export const api = new API();
 
 const reactRoot: Record<string, Root> = {};
 
+let cgpvCallbackMapInit: (mapId: string) => void | undefined;
+let cgpvCallbackMapReady: (mapId: string) => void | undefined;
+let cgpvCallbackLayersProcessed: (mapId: string) => void | undefined;
+let cgpvCallbackLayersLoaded: (mapId: string) => void | undefined;
+
 /**
  * Function to unmount a map element
  *
@@ -204,11 +209,10 @@ export async function initMapDivFromFunctionCall(mapDiv: HTMLElement, mapConfig:
 }
 
 /**
- * Initialize the cgpv and render it to root element
+ * Initializes the cgpv and render it to root element
  *
  * @param {(mapId: string) => void} callbackMapInit optional callback function to run once the map rendering is ready
  * @param {(mapId: string) => void} callbackMapLayersLoaded optional callback function to run once layers are loaded on the map
- * @returns {Promise<void>}
  */
 function init(callbackMapInit?: (mapId: string) => void, callbackMapLayersLoaded?: (mapId: string) => void): void {
   const mapElements = document.getElementsByClassName('geoview-map');
@@ -220,31 +224,53 @@ function init(callbackMapInit?: (mapId: string) => void, callbackMapLayersLoaded
       // Render the map
       const promiseMapInit = renderMap(mapElement);
 
+      // The callback for the map init when the promiseMapInit will resolve
+      const theCallbackMapInit = cgpvCallbackMapInit;
+
+      // The callback for the map ready when the promiseMapInit will resolve
+      const theCallbackMapReady = cgpvCallbackMapReady;
+
+      // The callback for the layers processed when the promiseMapInit will resolve
+      const theCallbackLayersProcessed = cgpvCallbackLayersProcessed;
+
+      // The callback for the layers loaded when the promiseMapInit will resolve
+      const theCallbackLayersLoaded = cgpvCallbackLayersLoaded;
+
       // When the map init is done
       promiseMapInit
         .then(() => {
           // Log
-          logger.logInfo('Map initialized', mapElement.getAttribute('id')!);
-
-          // TODO: Fix this timeout issue when geoCore layer are use in config: https://github.com/Canadian-Geospatial-Platform/geoview/issues/2380
-          // Set a timeout value if one of thelaeyrs is a geoCore type
           const mapId = mapElement.getAttribute('id')!;
-          const layerTypes = api.maps[mapId].mapFeaturesConfig.map.listOfGeoviewLayerConfig?.map((item) => item.geoviewLayerType) || [];
-          const geoCoreTimeout = layerTypes.includes('geoCore') ? 500 : 0;
-
-          // TODO: Fix this timeout issue when geoCore layer are use in config: https://github.com/Canadian-Geospatial-Platform/geoview/issues/2380
-          setTimeout(() => {
-            // Callback about it
-            callbackMapInit?.(mapId);
-
-            // Register when the map viewer will have loaded layers
-            api.maps[mapId].onMapLayersLoaded((mapViewerLoaded) => {
-              logger.logInfo('Map layers loaded', mapViewerLoaded.mapId);
-
-              // Callback for that particular map
-              callbackMapLayersLoaded?.(mapViewerLoaded.mapId);
-            });
-          }, geoCoreTimeout);
+          logger.logInfo('Map initialized', mapId);
+
+          // Callback about it
+          theCallbackMapInit?.(mapId);
+          callbackMapInit?.(mapId); // TODO: Obsolete call, remove it eventually
+
+          // Register when the map viewer will have a map ready
+          api.maps[mapId].onMapReady((mapViewer) => {
+            logger.logInfo('Map ready / layers registered', mapViewer.mapId);
+
+            // Callback for that particular map
+            theCallbackMapReady?.(mapViewer.mapId);
+          });
+
+          // Register when the map viewer will have loaded layers
+          api.maps[mapId].onMapLayersProcessed((mapViewer) => {
+            logger.logInfo('Map layers processed', mapViewer.mapId);
+
+            // Callback for that particular map
+            theCallbackLayersProcessed?.(mapViewer.mapId);
+          });
+
+          // Register when the map viewer will have loaded layers
+          api.maps[mapId].onMapLayersLoaded((mapViewer) => {
+            logger.logInfo('Map layers loaded', mapViewer.mapId);
+
+            // Callback for that particular map
+            theCallbackLayersLoaded?.(mapViewer.mapId);
+            callbackMapLayersLoaded?.(mapViewer.mapId); // TODO: Obsolete call, remove it eventually
+          });
         })
         .catch((error) => {
           // Log
@@ -254,9 +280,49 @@ function init(callbackMapInit?: (mapId: string) => void, callbackMapLayersLoaded
   }
 }
 
+/**
+ * Registers a callback when the map has been initialized
+ * @param {(mapId: string) => void} callback - The callback to be called
+ */
+export function onMapInit(callback: (mapId: string) => void): void {
+  // Keep the callback
+  cgpvCallbackMapInit = callback;
+}
+
+/**
+ * Registers a callback when the map has turned ready / layers were registered
+ * @param {(mapId: string) => void} callback - The callback to be called
+ */
+export function onMapReady(callback: (mapId: string) => void): void {
+  // Keep the callback
+  cgpvCallbackMapReady = callback;
+}
+
+/**
+ * Registers a callback when the layers have been processed
+ * @param {(mapId: string) => void} callback - The callback to be called
+ */
+export function onLayersProcessed(callback: (mapId: string) => void): void {
+  // Keep the callback
+  cgpvCallbackLayersProcessed = callback;
+}
+
+/**
+ * Registers a callback when the layers have been loaded
+ * @param {(mapId: string) => void} callback - The callback to be called
+ */
+export function onLayersLoaded(callback: (mapId: string) => void): void {
+  // Keep the callback
+  cgpvCallbackLayersLoaded = callback;
+}
+
 // cgpv object to be exported with the api for outside use
 export const cgpv: TypeCGPV = {
   init,
+  onMapInit,
+  onMapReady,
+  onLayersProcessed,
+  onLayersLoaded,
   api,
   react: React,
   createRoot,
diff --git a/packages/geoview-core/src/core/types/global-types.ts b/packages/geoview-core/src/core/types/global-types.ts
index 81194e81a90..d75b59cf618 100644
--- a/packages/geoview-core/src/core/types/global-types.ts
+++ b/packages/geoview-core/src/core/types/global-types.ts
@@ -53,6 +53,10 @@ export interface TypeWindow extends Window {
  */
 export type TypeCGPV = {
   init: CGPVInitCallback;
+  onMapInit: CGPVCallback;
+  onMapReady: CGPVCallback;
+  onLayersProcessed: CGPVCallback;
+  onLayersLoaded: CGPVCallback;
   api: API;
   react: typeof React;
   createRoot: typeof createRoot;
@@ -64,6 +68,7 @@ export type TypeCGPV = {
  * Type used for a callback function.
  */
 export type CGPVInitCallback = (callbackMapsInit?: (mapId: string) => void, callbackMapsLayersLoaded?: (mapId: string) => void) => void;
+export type CGPVCallback = (callback: (mapId: string) => void) => void;
 
 /** ******************************************************************************************************************************
  * Type used for exporting UI
diff --git a/packages/geoview-core/src/geo/layer/gv-layers/raster/gv-esri-dynamic.ts b/packages/geoview-core/src/geo/layer/gv-layers/raster/gv-esri-dynamic.ts
index 4f415f4c79c..92fe0bbcf9c 100644
--- a/packages/geoview-core/src/geo/layer/gv-layers/raster/gv-esri-dynamic.ts
+++ b/packages/geoview-core/src/geo/layer/gv-layers/raster/gv-esri-dynamic.ts
@@ -408,7 +408,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
             if (i === 0) {
               if (styleSettings.classBreakStyleInfo[0].visible !== false && styleSettings.defaultVisible === false)
                 filterArray.push(
-                  `${styleSettings.field} >= ${this.#formatFieldValue(
+                  `${styleSettings.field} >= ${GVEsriDynamic.#formatFieldValue(
                     styleSettings.field,
                     styleSettings.classBreakStyleInfo[0].minValue!,
                     layerConfig.source.featureInfo!
@@ -416,7 +416,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
                 );
               else if (styleSettings.classBreakStyleInfo[0].visible === false && styleSettings.defaultVisible !== false) {
                 filterArray.push(
-                  `${styleSettings.field} < ${this.#formatFieldValue(
+                  `${styleSettings.field} < ${GVEsriDynamic.#formatFieldValue(
                     styleSettings.field,
                     styleSettings.classBreakStyleInfo[0].minValue!,
                     layerConfig.source.featureInfo!
@@ -426,7 +426,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
               }
             } else if (styleSettings.classBreakStyleInfo[i].visible !== false && styleSettings.defaultVisible === false) {
               filterArray.push(
-                `${styleSettings.field} > ${this.#formatFieldValue(
+                `${styleSettings.field} > ${GVEsriDynamic.#formatFieldValue(
                   styleSettings.field,
                   styleSettings.classBreakStyleInfo[i].minValue!,
                   layerConfig.source.featureInfo!
@@ -434,7 +434,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
               );
               if (i + 1 === styleSettings.classBreakStyleInfo.length)
                 filterArray.push(
-                  `${styleSettings.field} <= ${this.#formatFieldValue(
+                  `${styleSettings.field} <= ${GVEsriDynamic.#formatFieldValue(
                     styleSettings.field,
                     styleSettings.classBreakStyleInfo[i].maxValue!,
                     layerConfig.source.featureInfo!
@@ -442,7 +442,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
                 );
             } else if (styleSettings.classBreakStyleInfo[i].visible === false && styleSettings.defaultVisible !== false) {
               filterArray.push(
-                `${styleSettings.field} <= ${this.#formatFieldValue(
+                `${styleSettings.field} <= ${GVEsriDynamic.#formatFieldValue(
                   styleSettings.field,
                   styleSettings.classBreakStyleInfo[i].minValue!,
                   layerConfig.source.featureInfo!
@@ -453,7 +453,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
           } else if (styleSettings.defaultVisible === false) {
             if (styleSettings.classBreakStyleInfo[i].visible === false) {
               filterArray.push(
-                `${styleSettings.field} <= ${this.#formatFieldValue(
+                `${styleSettings.field} <= ${GVEsriDynamic.#formatFieldValue(
                   styleSettings.field,
                   styleSettings.classBreakStyleInfo[i - 1].maxValue!,
                   layerConfig.source.featureInfo!
@@ -461,7 +461,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
               );
             } else if (i + 1 === styleSettings.classBreakStyleInfo.length) {
               filterArray.push(
-                `${styleSettings.field} <= ${this.#formatFieldValue(
+                `${styleSettings.field} <= ${GVEsriDynamic.#formatFieldValue(
                   styleSettings.field,
                   styleSettings.classBreakStyleInfo[i].maxValue!,
                   layerConfig.source.featureInfo!
@@ -470,7 +470,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
             }
           } else if (styleSettings.classBreakStyleInfo[i].visible !== false) {
             filterArray.push(
-              `${styleSettings.field} > ${this.#formatFieldValue(
+              `${styleSettings.field} > ${GVEsriDynamic.#formatFieldValue(
                 styleSettings.field,
                 styleSettings.classBreakStyleInfo[i - 1].maxValue!,
                 layerConfig.source.featureInfo!
@@ -483,7 +483,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
         }
         if (visibleWhenGreatherThisIndex !== -1)
           filterArray.push(
-            `${styleSettings.field} > ${this.#formatFieldValue(
+            `${styleSettings.field} > ${GVEsriDynamic.#formatFieldValue(
               styleSettings.field,
               styleSettings.classBreakStyleInfo[visibleWhenGreatherThisIndex].maxValue!,
               layerConfig.source.featureInfo!
@@ -613,7 +613,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
   ): string {
     let queryString = styleSettings.defaultVisible !== false && !level ? 'not (' : '(';
     for (let i = 0; i < queryTree.length; i++) {
-      const value = this.#formatFieldValue(styleSettings.fields[fieldOrder[level]], queryTree[i].fieldValue, sourceFeatureInfo);
+      const value = GVEsriDynamic.#formatFieldValue(styleSettings.fields[fieldOrder[level]], queryTree[i].fieldValue, sourceFeatureInfo);
       // The nextField array is not empty, then it is is not the last field
       if (queryTree[i].nextField.length) {
         // If i > 0 (true) then we add a OR clause
@@ -644,7 +644,7 @@ export class GVEsriDynamic extends AbstractGVRaster {
    * @returns {string} The resulting field value.
    * @private
    */
-  #formatFieldValue(fieldName: string, rawValue: string | number | Date, sourceFeatureInfo: TypeFeatureInfoLayerConfig): string {
+  static #formatFieldValue(fieldName: string, rawValue: string | number | Date, sourceFeatureInfo: TypeFeatureInfoLayerConfig): string {
     const fieldEntry = sourceFeatureInfo.outfields?.find((outfield) => outfield.name === fieldName);
     const fieldType = fieldEntry?.type;
     switch (fieldType) {
diff --git a/packages/geoview-core/src/geo/layer/gv-layers/raster/gv-wms.ts b/packages/geoview-core/src/geo/layer/gv-layers/raster/gv-wms.ts
index c1039b1b3aa..ec26a3e296f 100644
--- a/packages/geoview-core/src/geo/layer/gv-layers/raster/gv-wms.ts
+++ b/packages/geoview-core/src/geo/layer/gv-layers/raster/gv-wms.ts
@@ -169,7 +169,7 @@ export class GVWMS extends AbstractGVRaster {
           }
         } else featureMember = { plain_text: { '#text': response.data } };
         if (featureMember) {
-          const featureInfoResult = this.#formatWmsFeatureInfoResult(featureMember, clickCoordinate);
+          const featureInfoResult = GVWMS.#formatWmsFeatureInfoResult(featureMember, clickCoordinate);
           return featureInfoResult;
         }
       }
@@ -401,7 +401,7 @@ export class GVWMS extends AbstractGVRaster {
    * @returns {TypeFeatureInfoEntry[]} The feature info table.
    * @private
    */
-  #formatWmsFeatureInfoResult(featureMember: TypeJsonObject, clickCoordinate: Coordinate): TypeFeatureInfoEntry[] {
+  static #formatWmsFeatureInfoResult(featureMember: TypeJsonObject, clickCoordinate: Coordinate): TypeFeatureInfoEntry[] {
     const queryResult: TypeFeatureInfoEntry[] = [];
 
     let featureKeyCounter = 0;
diff --git a/packages/geoview-core/src/geo/map/map-viewer.ts b/packages/geoview-core/src/geo/map/map-viewer.ts
index 87bf5f0d4c6..2c96a816960 100644
--- a/packages/geoview-core/src/geo/map/map-viewer.ts
+++ b/packages/geoview-core/src/geo/map/map-viewer.ts
@@ -306,12 +306,10 @@ export class MapViewer {
     this.#mapInit = true;
     this.#emitMapInit();
 
-    MapEventProcessor.resetBasemap(this.mapId)
-      .then()
-      .catch((error) => {
-        // Log
-        logger.logPromiseFailed(' MapEventProcessor.resetBasemap in map-viewer', error);
-      });
+    MapEventProcessor.resetBasemap(this.mapId).catch((error) => {
+      // Log
+      logger.logPromiseFailed(' MapEventProcessor.resetBasemap in map-viewer', error);
+    });
 
     // Start checking for when the map will be ready
     this.#checkMapReady();