diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesCompressModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesCompressModal.jsx
index 32b59e031b..0448883fd4 100644
--- a/client/src/components/DataFiles/DataFilesModals/DataFilesCompressModal.jsx
+++ b/client/src/components/DataFiles/DataFilesModals/DataFilesCompressModal.jsx
@@ -80,7 +80,8 @@ const DataFilesCompressModal = () => {
           const handleSelectChange = (e) => {
             setFieldValue('compressionType', e.target.value);
           };
-          const formDisabled = status === 'RUNNING' || status === 'SUCCESS';
+          const formDisabled =
+            status.type === 'RUNNING' || status.type === 'SUCCESS';
           const buttonDisabled =
             formDisabled || !isValid || values.filenameDisplay === '';
           return (
@@ -89,6 +90,7 @@ const DataFilesCompressModal = () => {
                 <FormField
                   label="Compressed File Name"
                   name="filenameDisplay"
+                  id="filenameDisplay"
                   disabled={formDisabled}
                   addonType="append"
                   addon={
@@ -112,15 +114,18 @@ const DataFilesCompressModal = () => {
                 </p>
               </ModalBody>
               <ModalFooter>
-                <InlineMessage isVisible={status === 'SUCCESS'} type="success">
+                <InlineMessage
+                  isVisible={status.type === 'SUCCESS'}
+                  type="success"
+                >
                   Successfully started compress job
                 </InlineMessage>
                 <Button
                   disabled={buttonDisabled}
-                  isLoading={status === 'RUNNING'}
+                  isLoading={status.type === 'RUNNING'}
                   type="primary"
-                  size={status === 'ERROR' ? 'long' : 'medium'}
-                  iconNameBefore={status === 'ERROR' ? 'alert' : null}
+                  size={status.type === 'ERROR' ? 'long' : 'medium'}
+                  iconNameBefore={status.type === 'ERROR' ? 'alert' : null}
                   attr="submit"
                 >
                   Compress
diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesDownloadMessageModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesDownloadMessageModal.jsx
index 527632d5b7..93946847a6 100644
--- a/client/src/components/DataFiles/DataFilesModals/DataFilesDownloadMessageModal.jsx
+++ b/client/src/components/DataFiles/DataFilesModals/DataFilesDownloadMessageModal.jsx
@@ -189,7 +189,7 @@ const DataFilesDownloadMessageModal = () => {
                   disabled={buttonDisabled}
                   type="primary"
                   size={status.type === 'ERROR' ? 'long' : 'medium'}
-                  isLoading={status === 'RUNNING'}
+                  isLoading={status.type === 'RUNNING'}
                   iconNameBefore={status.type === 'ERROR' ? 'alert' : null}
                   attr="submit"
                 >
diff --git a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesCompressModal.fixture.js b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesCompressModal.fixture.js
new file mode 100644
index 0000000000..359ec6de51
--- /dev/null
+++ b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesCompressModal.fixture.js
@@ -0,0 +1,108 @@
+export const compressAppFixture = {
+  definition: {
+    jobAttributes: {
+      description: 'Compress a file or folder for download.',
+      dynamicExecSystem: false,
+      execSystemConstraints: null,
+      execSystemId: 'frontera',
+    },
+  },
+};
+
+const testFileSize1 = 1.5 * 1024 * 1024 * 1024;
+const testFileSize2 = 1 * 1024 * 1024 * 1024;
+
+const DataFilesCompressModalFixture = {
+  files: {
+    operationStatus: {
+      copy: {},
+      compress: {},
+    },
+    listing: {
+      FilesListing: [
+        {
+          name: 'testfile',
+          path: '/testfile',
+          lastModified: '2020-07-01T10:12:36-05:00',
+          length: 4096,
+          permissions: 'ALL',
+          format: 'folder',
+          system: 'test.system',
+          mimeType: 'text/directory',
+          type: 'dir',
+        },
+        {
+          name: 'test1.txt',
+          type: 'file',
+          length: testFileSize1,
+          path: '/test1.txt',
+          id: 123,
+        },
+        {
+          name: 'test2.txt',
+          type: 'file',
+          length: testFileSize1,
+          path: '/test2.txt',
+          id: 456,
+        },
+        {
+          name: 'test3.txt',
+          type: 'file',
+          length: testFileSize2,
+          path: '/test3.txt',
+          id: 234,
+        },
+        {
+          name: 'testFolder',
+          type: 'folder',
+          path: '/testFolder',
+          id: 789,
+        },
+      ],
+    },
+    params: {
+      FilesListing: {
+        api: 'tapis',
+        scheme: 'private',
+        system: 'test.system',
+        path: '',
+      },
+    },
+    selected: {
+      FilesListing: [0],
+      modal: [],
+    },
+    modals: {
+      compress: true,
+    },
+  },
+  workbench: {
+    config: {
+      compressApp: { id: 'compress', version: '0.0.4' },
+    },
+  },
+  allocations: {
+    portal_alloc: '',
+    active: [
+      {
+        systems: [
+          {
+            allocation: {
+              computeAllocated: 10,
+              computeUsed: 1.1,
+              project: '',
+            },
+            type: '',
+          },
+        ],
+      },
+    ],
+  },
+  systems: {
+    storage: {
+      configuration: [],
+    },
+  },
+};
+
+export default DataFilesCompressModalFixture;
diff --git a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesCompressModal.test.jsx b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesCompressModal.test.jsx
new file mode 100644
index 0000000000..9a2b7279b6
--- /dev/null
+++ b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesCompressModal.test.jsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import { useQuery } from '@tanstack/react-query';
+import configureStore from 'redux-mock-store';
+import { waitFor, renderHook } from '@testing-library/react';
+import { vi } from 'vitest';
+import renderComponent from 'utils/testing';
+import DataFilesCompressModalFixture, {
+  compressAppFixture,
+} from './DataFilesCompressModal.fixture';
+import DataFilesCompressModal from '../DataFilesCompressModal';
+import { getAppUtil } from 'hooks/datafiles/mutations/toolbarAppUtils';
+
+vi.mock('@tanstack/react-query');
+vi.mock('hooks/datafiles/mutations/toolbarAppUtils');
+const mockStore = configureStore();
+
+describe('DataFilesCompressModal', () => {
+  beforeEach(async () => {
+    getAppUtil.mockResolvedValue(compressAppFixture);
+    useQuery.mockReturnValue({ data: compressAppFixture });
+
+    const { result } = renderHook(() => useQuery('compress-app', getAppUtil));
+    await waitFor(() => result.current.isSuccess);
+  });
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+  it('renders the compress modal', async () => {
+    const store = mockStore(DataFilesCompressModalFixture);
+    const { findByText } = renderComponent(<DataFilesCompressModal />, store);
+
+    await waitFor(() =>
+      expect(findByText(/Compressed File Name/)).toBeDefined()
+    );
+  });
+
+  it('disables form when submitting compress job', async () => {
+    const store = mockStore({
+      ...DataFilesCompressModalFixture,
+      files: {
+        ...DataFilesCompressModalFixture.files,
+        operationStatus: { compress: { type: 'RUNNING' } },
+      },
+    });
+    const { findByLabelText } = renderComponent(
+      <DataFilesCompressModal />,
+      store
+    );
+
+    //const compressButtonText = await findByText('Compress');
+    //expect(compressButtonText.closest('button').toBeDisabled);
+    await waitFor(async () =>
+      expect(findByLabelText(/Compressed File Name/).toBeDisabled)
+    );
+  });
+
+  it('displays error state on error status', async () => {
+    const store = mockStore({
+      ...DataFilesCompressModalFixture,
+      files: {
+        ...DataFilesCompressModalFixture.files,
+        operationStatus: { compress: { type: 'ERROR' } },
+      },
+    });
+    const { findByTestId } = renderComponent(<DataFilesCompressModal />, store);
+
+    const compressErrorIcon = findByTestId('icon-before');
+    await waitFor(() => expect(compressErrorIcon.toBeVisible));
+  });
+});
diff --git a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.fixture.js b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.fixture.js
index b409824e2a..d999a20d1b 100644
--- a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.fixture.js
+++ b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.fixture.js
@@ -73,6 +73,20 @@ const DataFilesDownloadMessageModalFixture = {
   },
   allocations: {
     portal_alloc: '',
+    active: [
+      {
+        systems: [
+          {
+            allocation: {
+              computeAllocated: 10,
+              computeUsed: 1.1,
+              project: '',
+            },
+            type: '',
+          },
+        ],
+      },
+    ],
   },
   systems: {
     storage: {
diff --git a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.test.jsx b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.test.jsx
index 52ecd23efc..dd007fd668 100644
--- a/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.test.jsx
+++ b/client/src/components/DataFiles/DataFilesModals/tests/DataFilesDownloadMessageModal.test.jsx
@@ -1,11 +1,16 @@
 import React from 'react';
+import { useQuery } from '@tanstack/react-query';
 import configureStore from 'redux-mock-store';
 import renderComponent from 'utils/testing';
 import DataFilesDownloadMessageModalFixture from './DataFilesDownloadMessageModal.fixture';
 import DataFilesDownloadMessageModal from '../DataFilesDownloadMessageModal';
-import { fireEvent, screen, waitFor } from '@testing-library/react';
+import { compressAppFixture } from './DataFilesCompressModal.fixture';
+import { fireEvent, screen, waitFor, renderHook } from '@testing-library/react';
 import { vi } from 'vitest';
+import { getAppUtil } from 'hooks/datafiles/mutations/toolbarAppUtils';
 
+vi.mock('@tanstack/react-query');
+vi.mock('hooks/datafiles/mutations/toolbarAppUtils');
 const mockStore = configureStore();
 
 // Establish a boolean that checks for a folder among selectedFiles
@@ -13,23 +18,31 @@ let containsFolder = false;
 // Create test files for all tests
 
 describe('DataFilesDownloadMessageModal', () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     // Clear all mocks before each test
     vi.clearAllMocks();
+
+    getAppUtil.mockResolvedValue(compressAppFixture);
+    useQuery.mockReturnValue({ data: compressAppFixture });
+
+    const { result } = renderHook(() => useQuery('compress-app', getAppUtil));
+    await waitFor(() => result.current.isSuccess);
   });
 
-  it('renders the data files download message modal', () => {
+  it('renders the data files download message modal', async () => {
     const store = mockStore(DataFilesDownloadMessageModalFixture);
-    const { getAllByText } = renderComponent(
+    const { findAllByText } = renderComponent(
       <DataFilesDownloadMessageModal />,
       store
     );
 
-    expect(
-      getAllByText(
-        /Folders and multiple files must be compressed before downloading./
-      )
-    ).toBeDefined();
+    await waitFor(() =>
+      expect(
+        findAllByText(
+          /Folders and multiple files must be compressed before downloading./
+        )
+      ).toBeDefined()
+    );
   });
 
   // Test to prevent folder downloads
diff --git a/client/src/components/DataFiles/tests/DataFiles.test.jsx b/client/src/components/DataFiles/tests/DataFiles.test.jsx
index bafa794f09..431d836ade 100644
--- a/client/src/components/DataFiles/tests/DataFiles.test.jsx
+++ b/client/src/components/DataFiles/tests/DataFiles.test.jsx
@@ -27,7 +27,7 @@ describe('DataFiles', () => {
           },
           compress: {
             id: 'compress',
-            version: '0.0.3',
+            version: '0.0.4',
           },
         },
       },
diff --git a/client/src/hooks/datafiles/mutations/toolbarAppUtils.ts b/client/src/hooks/datafiles/mutations/toolbarAppUtils.ts
new file mode 100644
index 0000000000..55316b61f8
--- /dev/null
+++ b/client/src/hooks/datafiles/mutations/toolbarAppUtils.ts
@@ -0,0 +1,51 @@
+import { fetchUtil } from 'utils/fetchUtil';
+
+export const getAppUtil = async function fetchAppDefinitionUtil(
+  appId: string,
+  appVersion: string
+) {
+  const params = { appId, appVersion };
+  const result = await fetchUtil({
+    url: '/api/workspace/apps',
+    params,
+  });
+  return result.response;
+};
+
+function getAvailableHPCAlloc(activeAllocations: any, appExecSysId: string) {
+  // Returns the project name of the first available HPC allocation matching the
+  // exec system for the app with remaining compute time, or undefined if none found
+  for (let activeAlloc of activeAllocations) {
+    for (let allocSys of activeAlloc.systems) {
+      if (
+        allocSys.type === 'HPC' &&
+        allocSys.name.toLowerCase() === appExecSysId
+      ) {
+        const availCompute =
+          allocSys.allocation.computeAllocated -
+          allocSys.allocation.computeUsed;
+        if (availCompute > 0) {
+          return allocSys.allocation.project; // allocation name
+        }
+      }
+    }
+  }
+}
+
+export function getDefaultAllocation(allocationsState: any, appObj: any) {
+  if (allocationsState.portal_alloc) {
+    return allocationsState.portal_alloc;
+  }
+  if (
+    Array.isArray(allocationsState.active) &&
+    allocationsState.active.length > 0
+  ) {
+    return (
+      getAvailableHPCAlloc(
+        allocationsState.active,
+        appObj.definition.jobAttributes.execSystemId
+      ) || null
+    );
+  }
+  return null;
+}
diff --git a/client/src/hooks/datafiles/mutations/useCompress.ts b/client/src/hooks/datafiles/mutations/useCompress.ts
index 772cde5cc3..8d89ffee1a 100644
--- a/client/src/hooks/datafiles/mutations/useCompress.ts
+++ b/client/src/hooks/datafiles/mutations/useCompress.ts
@@ -1,9 +1,10 @@
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQuery } from '@tanstack/react-query';
 import { useSelector, useDispatch, shallowEqual } from 'react-redux';
 import { getCompressParams } from 'utils/getCompressParams';
 import { apiClient } from 'utils/apiClient';
 import { TTapisFile, TPortalSystem } from 'utils/types';
 import { TJobBody, TJobPostResponse } from './useSubmitJob';
+import { getAppUtil, getDefaultAllocation } from './toolbarAppUtils';
 
 async function submitJobUtil(body: TJobBody) {
   const res = await apiClient.post<TJobPostResponse>(
@@ -40,18 +41,13 @@ function useCompress() {
   const compressApp = useSelector(
     (state: any) => state.workbench.config.compressApp
   );
+  const { data: fullCompressApp } = useQuery({
+    queryKey: ['compress-app', compressApp.id, compressApp.version],
+    queryFn: () => getAppUtil(compressApp.id, compressApp.version),
+  });
 
   const defaultAllocation = useSelector((state: any) => {
-    if (state.allocations.portal_alloc) {
-      return state.allocations.portal_alloc;
-    }
-    if (
-      Array.isArray(state.allocations.active) &&
-      state.allocations.active.length > 0
-    ) {
-      return state.allocations.active[0].projectName || null;
-    }
-    return null;
+    return getDefaultAllocation(state.allocations, fullCompressApp);
   });
 
   const systems = useSelector(
@@ -73,10 +69,7 @@ function useCompress() {
     compressionType: string;
     fromDownload?: boolean;
   }) => {
-    dispatch({
-      type: 'DATA_FILES_SET_OPERATION_STATUS',
-      payload: { status: 'RUNNING', operation: 'compress' },
-    });
+    setStatus({ type: 'RUNNING' });
 
     let defaultPrivateSystem: TPortalSystem | undefined;
 
@@ -129,20 +122,14 @@ function useCompress() {
               },
             });
           } else if (response.status === 'PENDING') {
-            dispatch({
-              type: 'DATA_FILES_SET_OPERATION_STATUS',
-              payload: { status: { type: 'SUCCESS' }, operation: 'compress' },
-            });
+            setStatus({ type: 'SUCCESS' });
             dispatch({
               type: 'ADD_TOAST',
               payload: {
                 message: 'Compress job submitted.',
               },
             });
-            dispatch({
-              type: 'DATA_FILES_SET_OPERATION_STATUS',
-              payload: { operation: 'compress', status: {} },
-            });
+            setStatus({}); // clear compress status after successful submission
             if (!fromDownload) {
               dispatch({
                 type: 'DATA_FILES_TOGGLE_MODAL',
@@ -161,13 +148,7 @@ function useCompress() {
             response.cause === 'compressError'
               ? response.message
               : 'An error has occurred.';
-          dispatch({
-            type: 'DATA_FILES_SET_OPERATION_STATUS',
-            payload: {
-              status: { type: 'ERROR', message: errorMessage },
-              operation: 'compress',
-            },
-          });
+          setStatus({ type: 'ERROR', message: errorMessage });
         },
       }
     );
diff --git a/client/src/hooks/datafiles/mutations/useExtract.ts b/client/src/hooks/datafiles/mutations/useExtract.ts
index 1979b9d79b..730a464254 100644
--- a/client/src/hooks/datafiles/mutations/useExtract.ts
+++ b/client/src/hooks/datafiles/mutations/useExtract.ts
@@ -2,21 +2,9 @@ import { useMutation, useQuery } from '@tanstack/react-query';
 import { useSelector, useDispatch, shallowEqual } from 'react-redux';
 import { getExtractParams } from 'utils/getExtractParams';
 import { apiClient } from 'utils/apiClient';
-import { fetchUtil } from 'utils/fetchUtil';
 import { TTapisFile } from 'utils/types';
 import { TJobBody, TJobPostResponse } from './useSubmitJob';
-
-const getAppUtil = async function fetchAppDefinitionUtil(
-  appId: string,
-  appVersion: string
-) {
-  const params = { appId, appVersion };
-  const result = await fetchUtil({
-    url: '/api/workspace/apps',
-    params,
-  });
-  return result.response;
-};
+import { getAppUtil, getDefaultAllocation } from './toolbarAppUtils';
 
 async function submitJobUtil(body: TJobBody) {
   const res = await apiClient.post<TJobPostResponse>(
@@ -43,23 +31,13 @@ function useExtract() {
   const extractApp = useSelector(
     (state: any) => state.workbench.config.extractApp
   );
-  const defaultAllocation = useSelector((state: any) => {
-    if (state.allocations.portal_alloc) {
-      return state.allocations.portal_alloc;
-    }
-    if (
-      Array.isArray(state.allocations.active) &&
-      state.allocations.active.length > 0
-    ) {
-      return state.allocations.active[0].projectName || null;
-    }
-    return null;
-  });
-
-  const { data: latestExtract } = useQuery({
+  const { data: fullExtractApp } = useQuery({
     queryKey: ['extract-app', extractApp.id, extractApp.version],
     queryFn: () => getAppUtil(extractApp.id, extractApp.version),
   });
+  const defaultAllocation = useSelector((state: any) => {
+    return getDefaultAllocation(state.allocations, fullExtractApp);
+  });
 
   const { mutateAsync } = useMutation({ mutationFn: submitJobUtil });
 
@@ -77,7 +55,7 @@ function useExtract() {
     const params = getExtractParams(
       file,
       extractApp,
-      latestExtract,
+      fullExtractApp,
       defaultAllocation
     );
 
@@ -120,7 +98,7 @@ function useExtract() {
         },
         onError: (response) => {
           const errorMessage =
-            response.cause === 'compressError'
+            response.cause === 'extractError'
               ? response.message
               : 'An error has occurred.';
           dispatch({
diff --git a/client/src/redux/sagas/fixtures/jobdetaildisplay.fixture.js b/client/src/redux/sagas/fixtures/jobdetaildisplay.fixture.js
index 6a71f076da..feb5b7d57c 100644
--- a/client/src/redux/sagas/fixtures/jobdetaildisplay.fixture.js
+++ b/client/src/redux/sagas/fixtures/jobdetaildisplay.fixture.js
@@ -24,6 +24,11 @@ const jobDetailDisplayFixture = {
       label: 'Sleep Time',
       value: '1',
     },
+    {
+      label: '_mainProgram',
+      id: '_mainProgram',
+      value: 'OpenSeesSP',
+    },
   ],
   queue: 'development',
   systemName: 'Frontera',
diff --git a/client/src/utils/jobsUtil.js b/client/src/utils/jobsUtil.js
index 8d74836e24..294209856f 100644
--- a/client/src/utils/jobsUtil.js
+++ b/client/src/utils/jobsUtil.js
@@ -56,17 +56,38 @@ export function getAllocatonFromDirective(directive) {
   return null;
 }
 
+/**
+ * Get label for file name
+ * 
+ * Strips trailing autogenerated Tapis suffixes like `_1.2` which Tapis adds to file names.
+ *
+ * Examples:
+ * - "Input File_1.1" → "Input File"
+ * - "_1.2" → "--------------"   (assumes an addiitonal file and name is listed earlier)
+ * - null / "" → "Unnamed Input"
+ */
+export function getFileInputLabel(inputName) {
+  const original = inputName || '';
+  const stripped = original.replace(/_\d+\.\d+$/, '').trim();
+
+  if (!stripped) {
+    return /^_\d+\.\d+$/.test(original.trim())
+      ? '--------------'
+      : 'Unnamed Input';
+  }
+
+  return stripped;
+}
+
 /**
  * Get display values from job, app and execution system info
  */
 export function getJobDisplayInformation(job, app) {
   const filterHiddenObjects = (objects) =>
-    objects
-      .filter((obj) => {
-        const notes = obj.notes ? JSON.parse(obj.notes) : null;
-        return !notes || !notes.isHidden;
-      })
-      .filter((obj) => !(obj.name || obj.sourceUrl || '').startsWith('_'));
+    objects.filter((obj) => {
+      const notes = obj.notes ? JSON.parse(obj.notes) : null;
+      return !notes || !notes.isHidden;
+    });
 
   const fileInputs = filterHiddenObjects(JSON.parse(job.fileInputs));
   const parameterSet = JSON.parse(job.parameterSet);
@@ -74,11 +95,12 @@ export function getJobDisplayInformation(job, app) {
 
   const envVariables = parameterSet.envVariables;
   const schedulerOptions = parameterSet.schedulerOptions;
+
   const display = {
     applicationName: job.appId,
     systemName: job.execSystemId,
     inputs: fileInputs.map((input) => ({
-      label: input.name || 'Unnamed Input',
+      label: getFileInputLabel(input.name),
       id: input.sourceUrl,
       value: input.sourceUrl,
     })),
diff --git a/client/src/utils/jobsUtil.test.js b/client/src/utils/jobsUtil.test.js
index dbad00414a..8f01abd15b 100644
--- a/client/src/utils/jobsUtil.test.js
+++ b/client/src/utils/jobsUtil.test.js
@@ -5,6 +5,7 @@ import {
   getExecutionPath,
   isTerminalState,
   isOutputState,
+  getFileInputLabel,
 } from './jobsUtil';
 import jobDetailFixture from '../redux/sagas/fixtures/jobdetail.fixture';
 import jobDetailSlurmFixture from '../redux/sagas/fixtures/jobdetailSlurm.fixture';
@@ -57,4 +58,11 @@ describe('jobsUtil', () => {
     expect(isOutputState('STOPPED')).toEqual(false);
     expect(isOutputState('RUNNING')).toEqual(false);
   });
+
+  it('get file input label ', () => {
+    expect(getFileInputLabel('Input File')).toEqual('Input File');
+    expect(getFileInputLabel('Input File_1.1')).toEqual('Input File');
+    expect(getFileInputLabel('_1.2')).toEqual('--------------');
+    expect(getFileInputLabel('_21.12')).toEqual('--------------');
+  });
 });