Caltech-IPAC · robyww · Aug 13, 2026 · Aug 4, 2026
diff --git a/component-library/src/images/Coverage.jsx b/component-library/src/images/Coverage.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Box } from '@mui/joy';
 import PropTypes from 'prop-types';
 import { CoverageViewer } from 'firefly/visualize/ui/CoveraeViewer.jsx';
-import { DEFAULT_COVERAGE_VIEWER_ID } from 'firefly/visualize/PlotViewUtil.js';
+import {DEFAULT_COVERAGE_VIEWER_ID} from 'firefly/visualize/VisConst.js';
 
 /**
  * Displays table coverage/footprint overlaid on a sky image as markers.

diff --git a/component-library/src/images/ImagePlot.jsx b/component-library/src/images/ImagePlot.jsx
@@ -2,7 +2,7 @@ import React, { useId, useEffect } from 'react';
 import { Box } from '@mui/joy';
 import PropTypes from 'prop-types';
 import { ApiFullImageDisplay } from 'firefly/visualize/ui/ApiFullImageDisplay.jsx';
-import { dispatchPlotImage, dispatchDeletePlotView } from 'firefly/visualize/ImagePlotCntlr.js';
+import {dispatchDeletePlotView, dispatchPlotImage} from 'firefly/visualize/ImagePlotDispatch.js';
 import WebPlotRequest from 'firefly/visualize/WebPlotRequest.js';
 
 /**

diff --git a/src/firefly/java/edu/caltech/ipac/astro/ibe/IBE.java b/src/firefly/java/edu/caltech/ipac/astro/ibe/IBE.java
@@ -165,7 +165,11 @@ private void downloadViaUrlToFile(URL url, File results) throws IOException {
             HttpServiceInput addtlInfo = new HttpServiceInput(url.toString());
             addtlInfo.setHeader("Accept", "text/plain");
 
-            URLDownload.getDataToFile(url, results, addtlInfo.getCookies(), addtlInfo.getHeaders());
+            FileInfo fi= URLDownload.getDataToFile(url, results, addtlInfo.getCookies(), addtlInfo.getHeaders());
+            if (!fi.isSuccess()) {
+                throw new IOException(fi.getResponseCodeMsg(),
+                        new FailedRequestException(fi.getResponseCodeMsg(),"network fail", fi.getResponseCode(), fi));
+            }
         } catch (FailedRequestException e) {
             throw new IOException(e.getUserMessage(), e);
         }

diff --git a/src/firefly/java/edu/caltech/ipac/firefly/data/FileInfo.java b/src/firefly/java/edu/caltech/ipac/firefly/data/FileInfo.java
@@ -11,6 +11,7 @@
 
 import java.io.File;
 import java.io.Serializable;
+import java.net.HttpURLConnection;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -129,6 +130,7 @@ public File getFile() {
     public boolean isBlank() { return StringUtils.getBoolean(attributes.get(BLANK), false); }
     public int getResponseCode() { return StringUtils.getInt(attributes.get(RESPONSE_CODE), 200); }
     public boolean isOK() { return getResponseCode()==200; }
+    public boolean isSuccess() { return getResponseCode()==200 ||  getResponseCode()==HttpURLConnection.HTTP_NOT_MODIFIED; }
     public String getResponseCodeMsg() { return attributes.get(RESPONSE_CODE_MSG); }
 
 

diff --git a/src/firefly/java/edu/caltech/ipac/visualize/net/IbeImageGetter.java b/src/firefly/java/edu/caltech/ipac/visualize/net/IbeImageGetter.java
@@ -146,9 +146,13 @@ else if (params instanceof PtfImageParams) {
           }
 
       } catch (IOException me){
+          if (me.getCause() instanceof FailedRequestException fre) {
+              if (fre.getFileInfo() != null && !fre.getFileInfo().isSuccess()) {
+                  throw new FailedRequestException(fre.getFileInfo().getResponseCodeMsg(), me);
+              }
+          }
           throw new FailedRequestException( "Could not parse results", "Details in exception", me );
       }
-
     }
 
 }
diff --git a/src/firefly/js/Firefly.js b/src/firefly/js/Firefly.js
@@ -28,8 +28,9 @@ import {bootstrapRedux, flux} from './core/ReduxFlux.js';
 import {getOrCreateWsConn} from './core/messaging/WebSocketClient.js';
 import {ActionEventHandler} from './core/messaging/MessageHandlers.js';
 import {getJsonProperty, notifyServerAppInit} from './rpc/CoreServices.js';
-import {getPropsWith, mergeObjectOnly, getProp, toBoolean, documentReady,uuid} from './util/WebUtil.js';
-import {dispatchChangeTableAutoScroll, dispatchWcsMatch, visRoot} from './visualize/ImagePlotCntlr.js';
+import {getPropsWith, mergeObjectOnly, getProp, toBoolean, documentReady} from './util/WebUtil.js';
+import {dispatchChangeTableAutoScroll, dispatchWcsMatch} from './visualize/ImagePlotDispatch';
+import {visRoot} from './visualize/VisStoreRoots';
 import {Logger} from './util/Logger.js';
 import {evaluateWebApi, initWebApi, isUsingWebApi, WebApiStat} from './api/WebApi.js';
 import {WebApiHelpInfoPage} from './ui/WebApiHelpInfoPage.jsx';

diff --git a/src/firefly/js/api/ApiBuild.js b/src/firefly/js/api/ApiBuild.js
@@ -1,59 +1,63 @@
 /*
  * License information at https://github.com/Caltech-IPAC/firefly/blob/master/License.txt
  */
-import React from 'react';
+import {ApiToolbarImageDisplay} from 'firefly/visualize/ui/ApiToolbarImageDisplay.jsx';
 import {isString} from 'lodash';
-import {dispatchOnAppReady} from '../core/AppDataCntlr.js';
-import {ServerRequest } from '../data/ServerRequest.js';
-import {getJsonData } from '../rpc/SearchServicesJson.js';
+import React from 'react';
+import * as ChartsCntlr from '../charts/ChartsCntlr.js';
 
 // Used for dispatch and action type constants
 import * as TableStatsCntlr from '../charts/TableStatsCntlr.js';
-import * as ChartsCntlr from '../charts/ChartsCntlr.js';
+import {ChartPanel} from '../charts/ui/ChartPanel.jsx';
+import {ChartsContainer} from '../charts/ui/ChartsContainer.jsx';
+import {MultiChartViewer} from '../charts/ui/MultiChartViewer.jsx';
+import {PlotlyWrapper} from '../charts/ui/PlotlyWrapper.jsx';
+import * as AppDataCntlr from '../core/AppDataCntlr.js';
+import {dispatchOnAppReady} from '../core/AppDataCntlr.js';
+import {APP_DATA_PATH} from '../core/CoreConst';
+import {dispatchAddCell, dispatchEnableSpecialViewer, dispatchRemoveCell} from '../core/LayoutCntlr.js';
+import {dispatchAddActionWatcher, dispatchAddSaga, dispatchAddTableTypeWatcherDef} from '../core/MasterSaga.js';
+import {ServerRequest} from '../data/ServerRequest.js';
+import {getJsonData} from '../rpc/SearchServicesJson.js';
+import * as HpxIndexCntlr from '../tables/HpxIndexCntlr.js';
 import * as TablesCntlr from '../tables/TablesCntlr.js';
+import {TablePanel} from '../tables/ui/TablePanel.jsx';
+import {TablesContainer} from '../tables/ui/TablesContainer.jsx';
+
+import {startTTFeatureWatchers} from '../templates/common/ttFeatureWatchers.js';
+import {FieldGroup} from '../ui/FieldGroup.jsx';
+import {showWorkspaceDialog, WorkspacePickerPopup} from '../ui/WorkspaceViewer.jsx';
+import * as DrawLayerDispatch from '../visualize/DrawLayerDispatch';
+import * as ImPlotDispatch from '../visualize/ImagePlotDispatch';
+import {ImageExpandedMode} from '../visualize/iv/ImageExpandedMode.jsx';
+import {ImageViewer} from '../visualize/iv/ImageViewer.jsx';
 import * as ReadoutCntlr from '../visualize/MouseReadoutCntlr.js';
-import * as ImPlotCntlr from '../visualize/ImagePlotCntlr.js';
-import * as HpxIndexCntlr from '../tables/HpxIndexCntlr.js';
 import * as MultiViewCntlr from '../visualize/MultiViewCntlr.js';
-import * as AppDataCntlr from '../core/AppDataCntlr.js';
-import * as DrawLayerCntlr from '../visualize/DrawLayerCntlr.js';
-import * as ComponentCntlr from '../core/ComponentCntlr.js';
-import {ApiExpandedView} from './ApiExpandedView.jsx';
-import {dispatchAddCell, dispatchRemoveCell, dispatchEnableSpecialViewer} from '../core/LayoutCntlr.js';
-import {dispatchAddSaga, dispatchAddActionWatcher, dispatchAddTableTypeWatcherDef} from '../core/MasterSaga.js';
-import {showWorkspaceDialog, WorkspacePickerPopup} from '../ui/WorkspaceViewer.jsx';
-import {FieldGroup} from '../ui/FieldGroup.jsx';
-
-// Parts of the lowlevel api
-import * as ApiUtil from './ApiUtil.js';
-import  * as ApiUtilChart from './ApiUtilChart.jsx';
-import moreChartApi from './ApiUtilChart.jsx';
-import  * as ApiUtilImage from './ApiUtilImage.jsx';
-import  * as ApiUtilTable from './ApiUtilTable.jsx';
+import {getActiveRowToImageDef} from '../visualize/saga/ActiveRowToImageWatcher.js';
+import {getMocWatcherDef} from '../visualize/saga/MOCWatcher.js';
+import {ApiExpandedDisplay} from '../visualize/ui/ApiExpandedDisplay.jsx';
+import {ApiFullImageDisplay} from '../visualize/ui/ApiFullImageDisplay.jsx';
+import {ImageMetaDataToolbar} from '../visualize/ui/ImageMetaDataToolbar.jsx';
 
 // UI component
 import {MultiImageViewer} from '../visualize/ui/MultiImageViewer.jsx';
-import {ImageViewer} from '../visualize/iv/ImageViewer.jsx';
-import {ImageMetaDataToolbar} from '../visualize/ui/ImageMetaDataToolbar.jsx';
 import {MultiViewStandardToolbar} from '../visualize/ui/MultiViewStandardToolbar.jsx';
-import {ImageExpandedMode} from '../visualize/iv/ImageExpandedMode.jsx';
-import {ApiExpandedDisplay} from '../visualize/ui/ApiExpandedDisplay.jsx';
-import {ApiFullImageDisplay} from '../visualize/ui/ApiFullImageDisplay.jsx';
-import {ApiToolbarImageDisplay} from 'firefly/visualize/ui/ApiToolbarImageDisplay.jsx';
-import {TablesContainer} from '../tables/ui/TablesContainer.jsx';
-import {TablePanel} from '../tables/ui/TablePanel.jsx';
-import {ChartsContainer} from '../charts/ui/ChartsContainer.jsx';
-import {ChartPanel} from '../charts/ui/ChartPanel.jsx';
-import {MultiChartViewer} from '../charts/ui/MultiChartViewer.jsx';
-import {PlotlyWrapper} from '../charts/ui/PlotlyWrapper.jsx';
+import * as VisConst from '../visualize/VisConst.js';
+import {DRAWLAYER_PREFIX, IMAGE_MULTI_VIEW_PREFIX, PLOTS_PREFIX} from '../visualize/VisConst.js';
+import {ApiExpandedView} from './ApiExpandedView.jsx';
+
 
 // builds the highlevel api
 import {buildHighLevelApi} from './ApiHighlevelBuild.js';
-import {buildViewerApi} from './ApiViewer.js';
 
-import {startTTFeatureWatchers} from '../templates/common/ttFeatureWatchers.js';
-import {getActiveRowToImageDef} from '../visualize/saga/ActiveRowToImageWatcher.js';
-import {getMocWatcherDef} from '../visualize/saga/MOCWatcher.js';
+
+// Parts of the lowlevel api
+import * as ApiUtil from './ApiUtil.js';
+import * as ApiUtilChart from './ApiUtilChart.jsx';
+import moreChartApi from './ApiUtilChart.jsx';
+import * as ApiUtilImage from './ApiUtilImage.jsx';
+import * as ApiUtilTable from './ApiUtilTable.jsx';
+import {buildViewerApi} from './ApiViewer.js';
 
 
 /**
@@ -172,11 +176,11 @@ export function buildLowlevelAPI() {
         findActionType(TablesCntlr, TablesCntlr.RESULTS_PREFIX),
         findActionType(TablesCntlr, TablesCntlr.UI_PREFIX),
         findActionType(ReadoutCntlr, ReadoutCntlr.READOUT_PREFIX),
-        findActionType(MultiViewCntlr, MultiViewCntlr.IMAGE_MULTI_VIEW_PREFIX),
-        findActionType(ImPlotCntlr.default, ImPlotCntlr.PLOTS_PREFIX),
+        findActionType(VisConst, IMAGE_MULTI_VIEW_PREFIX),
+        findActionType(VisConst, PLOTS_PREFIX),
+        findActionType(VisConst, DRAWLAYER_PREFIX),
         findActionType(HpxIndexCntlr, HpxIndexCntlr.SPACIAL_HPX_INDX_PREFIX),
-        findActionType(AppDataCntlr, AppDataCntlr.APP_DATA_PATH),
-        findActionType(DrawLayerCntlr.default, DrawLayerCntlr.DRAWLAYER_PREFIX)
+        findActionType(AppDataCntlr, APP_DATA_PATH),
     );
 
 
@@ -187,10 +191,10 @@ export function buildLowlevelAPI() {
         findDispatch(TablesCntlr),
         findDispatch(ReadoutCntlr),
         findDispatch(MultiViewCntlr),
-        findDispatch(ImPlotCntlr),
+        findDispatch(ImPlotDispatch),
         findDispatch(HpxIndexCntlr),
         findDispatch(AppDataCntlr),
-        findDispatch(DrawLayerCntlr),
+        findDispatch(DrawLayerDispatch),
         {dispatchAddCell, dispatchRemoveCell, dispatchEnableSpecialViewer},
         {dispatchAddSaga, dispatchAddActionWatcher, dispatchAddTableTypeWatcherDef}
     );

diff --git a/src/firefly/js/api/ApiExpandedView.jsx b/src/firefly/js/api/ApiExpandedView.jsx
@@ -8,13 +8,13 @@ import {PinnedChartPanel} from '../charts/ui/PinnedChartContainer.jsx';
 import {TablesContainer} from '../tables/ui/TablesContainer.jsx';
 import {ChartsContainer} from '../charts/ui/ChartsContainer.jsx';
 import {useStoreConnector} from '../ui/SimpleComponent.jsx';
-import {PINNED_CHART_VIEWER_ID} from '../visualize/MultiViewCntlr.js';
 import {ApiExpandedDisplay} from '../visualize/ui/ApiExpandedDisplay.jsx';
 import {FireflyRoot} from '../ui/FireflyRoot.jsx';
 import {isDefined} from '../util/WebUtil.js';
-import {dispatchChangeExpandedMode, ExpandType} from '../visualize/ImagePlotCntlr.js';
 import {dispatchSetLayoutMode, getExpandedMode, LO_MODE, LO_VIEW} from '../core/LayoutCntlr.js';
 import {getExpandedChartProps} from '../charts/ChartsCntlr.js';
+import {dispatchChangeExpandedMode} from '../visualize/ImagePlotDispatch';
+import {ExpandType, PINNED_CHART_VIEWER_ID} from '../visualize/VisConst';
 
 const closeFunc = () => {
     dispatchChangeExpandedMode(ExpandType.COLLAPSE);

diff --git a/src/firefly/js/api/ApiUtilImage.jsx b/src/firefly/js/api/ApiUtilImage.jsx
@@ -2,8 +2,7 @@
  * License information at https://github.com/Caltech-IPAC/firefly/blob/master/License.txt
  */
 
-import React from 'react';
-import {visRoot} from '../visualize/ImagePlotCntlr.js';
+import {visRoot} from '../visualize/VisStoreRoots';
 import {primePlot} from '../visualize/PlotViewUtil.js';
 import {getBootstrapRegistry} from '../core/BootstrapRegistry';
 import {RangeValues} from '../visualize/RangeValues.js';
@@ -26,7 +25,8 @@ import {RangeValues} from '../visualize/RangeValues.js';
 export {RangeValues} from '../visualize/RangeValues.js';
 export {WPConst, WebPlotRequest, findInvalidWPRKeys, confirmPlotRequest} from '../visualize/WebPlotRequest.js';
 export {RequestType} from '../visualize/RequestType';
-export {ExpandType, visRoot} from '../visualize/ImagePlotCntlr.js';
+export {visRoot} from '../visualize/VisStoreRoots.js';
+export {ExpandType} from '../visualize/VisConst.js';
 
 export {CysConverter} from '../visualize/CsysConverter.js';
 export {CCUtil} from '../visualize/CsysConverter.js';
@@ -37,7 +37,7 @@ export {extensionAdd, extensionRemove} from '../core/ExternalAccessUtils.js';
 export {makeWorldPt, makeScreenPt, makeImagePt, parsePt, parseAnyPt, parseWorldPt } from '../visualize/Point.js';
 export {CoordinateSys} from '../visualize/CoordSys.js';
 
-export {IMAGE, NewPlotMode} from '../visualize/MultiViewCntlr';
+export {IMAGE, NewPlotMode} from '../visualize/VisConst.js';
 
 
 /**
@@ -77,15 +77,6 @@ export function setDrawLayerDefaults(drawLayerTypeId, defaults) {
     getBootstrapRegistry().setDrawLayerDefaults(drawLayerTypeId, defaults);
 }
 
-/**
- * @summary  initialize the auto readout. Must be call once at the begging to get the popup readout running.
- * @param {object} ReadoutComponent - either a PopupMouseReadoutMinimal or PopupMouseReadoutFull
- * @param {object} props - a list of the properties
- * @public
- * @deprecated
- * @function initAutoReadout
- * @memberof firefly.util.image
- */
 export function initAutoReadout() {}
 
 

diff --git a/src/firefly/js/api/ApiViewer.js b/src/firefly/js/api/ApiViewer.js
@@ -12,7 +12,8 @@ import Enum from 'enum';
 import {WSCH} from '../core/History.js';
 import {debug} from './ApiUtil.js';
 import {dispatchRemoteAction}  from '../core/JsonUtils.js';
-import {dispatchPlotImage, dispatchPlotHiPS}  from '../visualize/ImagePlotCntlr.js';
+import {DEFAULT_FITS_VIEWER_ID, DEFAULT_PLOT2D_VIEWER_ID, PINNED_CHART_VIEWER_ID} from '../visualize/VisConst';
+import {dispatchPlotHiPS, dispatchPlotImage} from '../visualize/ImagePlotDispatch';
 import {RequestType}  from '../visualize/RequestType.js';
 import {hashCode, getRootURL, modifyURLToFull}  from '../util/WebUtil.js';
 import {Logger}  from '../util/Logger.js';
@@ -21,10 +22,12 @@ import {dispatchTableSearch, dispatchTableFetch}  from '../tables/TablesCntlr.js
 import {dispatchChartAdd} from '../charts/ChartsCntlr.js';
 import {makeFileRequest}  from '../tables/TableRequestUtil.js';
 import {uniqueChartId} from '../charts/ChartUtil.js';
-import {getWsChannel, getWsConnId, getConnectionCount, makeViewerChannel,
-    REINIT_APP, WS_CONN_UPDATED, GRAB_WINDOW_FOCUS, NOTIFY_REMOTE_APP_READY} from '../core/AppDataCntlr.js';
+import {REINIT_APP} from '../core/CoreConst';
+import {
+    getWsChannel, getWsConnId, getConnectionCount, makeViewerChannel,
+    WS_CONN_UPDATED, GRAB_WINDOW_FOCUS, NOTIFY_REMOTE_APP_READY
+} from '../core/AppDataCntlr.js';
 import {dispatchAddCell, dispatchEnableSpecialViewer, LO_VIEW} from '../core/LayoutCntlr.js';
-import {DEFAULT_FITS_VIEWER_ID, DEFAULT_PLOT2D_VIEWER_ID, PINNED_CHART_VIEWER_ID} from '../visualize/MultiViewCntlr.js';
 import {dispatchAddActionWatcher} from '../core/MasterSaga.js';
 import {WEB_API_CMD} from './WebApi.js';
 

diff --git a/src/firefly/js/api/webApiCommands/ImageCommands.js b/src/firefly/js/api/webApiCommands/ImageCommands.js
@@ -3,12 +3,11 @@ import {dispatchHideDropDown, dispatchShowDropDown} from '../../core/LayoutCntlr
 import {ServerParams} from '../../data/ServerParams.js';
 import {makeTblRequest, MAX_ROW} from '../../tables/TableRequestUtil.js';
 import {doFetchTable} from '../../tables/TableUtil.js';
-import {toBoolean} from '../../util/WebUtil.js';
+import {DEFAULT_FITS_VIEWER_ID} from '../../visualize/VisConst';
 import WebPlotRequest, {findInvalidWPRKeys, WPConst} from '../../visualize/WebPlotRequest';
 import {isEmpty,isArray,omit} from 'lodash';
-import {dispatchPlotHiPS, dispatchPlotImage} from '../../visualize/ImagePlotCntlr';
+import {dispatchPlotHiPS, dispatchPlotImage} from '../../visualize/ImagePlotDispatch';
 import {RequestType} from '../../visualize/RequestType';
-import {DEFAULT_FITS_VIEWER_ID} from '../../visualize/MultiViewCntlr';
 import {makeExamples, ReservedParams} from '../WebApi';
 
 

diff --git a/src/firefly/js/apps/alertviewer/AlertResultView.jsx b/src/firefly/js/apps/alertviewer/AlertResultView.jsx
@@ -8,7 +8,7 @@ import {MultiImageViewer} from '../../visualize/ui/MultiImageViewer.jsx';
 import {useStoreConnector} from '../../ui/SimpleComponent.jsx';
 
 import {getTblById, getTblIdsByGroup} from '../../tables/TableUtil.js';
-import {visRoot} from 'firefly/visualize/ImagePlotCntlr';
+import {visRoot} from '../../visualize/VisStoreRoots';
 import {getPlotViewAry} from 'firefly/visualize/PlotViewUtil.js';
 
 import {ALERT} from './AlertIDs.js';

diff --git a/src/firefly/js/apps/alertviewer/AlertUploadPanel.jsx b/src/firefly/js/apps/alertviewer/AlertUploadPanel.jsx
@@ -14,7 +14,8 @@ import {ALERT} from './AlertIDs.js';
 import {dispatchTableSearch} from 'firefly/tables/TablesCntlr';
 import WebPlotRequest, {TitleOptions} from 'firefly/visualize/WebPlotRequest';
 import RangeValues from 'firefly/visualize/RangeValues';
-import {dispatchDeletePlotView, dispatchPlotImage, dispatchWcsMatch, WcsMatchType} from 'firefly/visualize/ImagePlotCntlr';
+import {dispatchDeletePlotView, dispatchPlotImage, dispatchWcsMatch} from '../../visualize/ImagePlotDispatch';
+import {WcsMatchType} from '../../visualize/VisConst';
 import {dispatchComponentStateChange} from 'firefly/core/ComponentCntlr';
 import {removeTablesFromGroup} from 'firefly/tables/TableUtil';
 import {dispatchChartRemove} from 'firefly/charts/ChartsCntlr';
@@ -149,7 +150,7 @@ function clearAlertProducts() {
     dispatchChartRemove(ALERT.CHART_1_ID);
 
     [ALERT.IMG_PLOT_1, ALERT.IMG_PLOT_2, ALERT.IMG_PLOT_3].forEach((plotId) =>
-        dispatchDeletePlotView({plotId, holdWcsMatch: true})
+        dispatchDeletePlotView({plotId})
     );
 }
 

diff --git a/src/firefly/js/charts/ChartsCntlr.js b/src/firefly/js/charts/ChartsCntlr.js
@@ -11,14 +11,16 @@ import {Logger} from '../util/Logger.js';
 import {getTblById, getColumns, isFullyLoaded, COL_TYPE} from '../tables/TableUtil.js';
 import {dispatchAddActionWatcher} from '../core/MasterSaga.js';
 import * as TablesCntlr from '../tables/TablesCntlr.js';
-import {DEFAULT_PLOT2D_VIEWER_ID, dispatchAddViewerItems, dispatchUpdateCustom, dispatchRemoveViewerItems,
+import {dispatchAddViewerItems, dispatchUpdateCustom, dispatchRemoveViewerItems,
     getMultiViewRoot, getViewer} from '../visualize/MultiViewCntlr.js';
+import {DEFAULT_PLOT2D_VIEWER_ID} from '../visualize/VisConst';
 import {applyDefaults, flattenAnnotations, formatColExpr, getPointIdx, getRowIdx, handleTableSourceConnections,
         clearChartConn, newTraceFrom, setupTableWatcher, HIGHLIGHTED_PROPS, SELECTED_PROPS, TBL_SRC_PATTERN,
         getSelIndexes, isSpectralOrder, combineAllTraceFrom} from './ChartUtil.js';
 import {FilterInfo} from '../tables/FilterInfo.js';
 import {SelectInfo} from '../tables/SelectInfo.js';
-import {REINIT_APP, getAppOptions} from '../core/AppDataCntlr.js';
+import {REINIT_APP} from '../core/CoreConst';
+import {getAppOptions} from '../core/AppDataCntlr.js';
 import {showInfoPopup} from '../ui/PopupUtil.jsx';
 import {makeHistogramParams, makeXYPlotParams, getDefaultChartProps} from './ChartUtil.js';
 import {adjustColorbars, hasFireflyColorbar} from './dataTypes/FireflyHeatmap.js';
@@ -442,7 +444,7 @@ function chartFilterSelection(action) {
                 y = `ifnull(${y},${lowerLimit})`;
             }
 
-            const multiArea = get(selection, 'multiArea')
+            const multiArea = get(selection, 'multiArea');
             if (multiArea) {
                 showInfoPopup('Filtering is only supported for one selection area.', 'Warning');
                 return;

diff --git a/src/firefly/js/charts/TableStatsCntlr.js b/src/firefly/js/charts/TableStatsCntlr.js
@@ -4,7 +4,7 @@ import {get, has, omit} from 'lodash';
 
 import {updateSet, updateMerge} from '../util/WebUtil.js';
 import ColValuesStatistics from './ColValuesStatistics.js';
-import {REINIT_APP} from '../core/AppDataCntlr.js';
+import {REINIT_APP} from '../core/CoreConst';
 
 import {makeTblRequest, cloneRequest, MAX_ROW} from '../tables/TableRequestUtil.js';
 import {getTblById, doFetchTable, getColumns, COL_TYPE} from '../tables/TableUtil.js';