diff --git a/frontend/src/components/tools/compress/CompressSettings.tsx b/frontend/src/components/tools/compress/CompressSettings.tsx
index 47ff4189e..d82a99453 100644
--- a/frontend/src/components/tools/compress/CompressSettings.tsx
+++ b/frontend/src/components/tools/compress/CompressSettings.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from "react";
 import { Button, Stack, Text, NumberInput, Select, Divider } from "@mantine/core";
 import { useTranslation } from "react-i18next";
-import { CompressParameters } from "../../../hooks/tools/compress/useCompressOperation";
+import { CompressParameters } from "../../../hooks/tools/compress/useCompressParameters";
 
 interface CompressSettingsProps {
   parameters: CompressParameters;
diff --git a/frontend/src/components/tools/ocr/AdvancedOCRSettings.tsx b/frontend/src/components/tools/ocr/AdvancedOCRSettings.tsx
index 3bd8c1569..a38926edf 100644
--- a/frontend/src/components/tools/ocr/AdvancedOCRSettings.tsx
+++ b/frontend/src/components/tools/ocr/AdvancedOCRSettings.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Stack, Text, Checkbox } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
-import { OCRParameters } from './OCRSettings';
+import { OCRParameters } from '../../../hooks/tools/ocr/useOCRParameters';
 
 export interface AdvancedOCRParameters {
   advancedOptions: string[];
diff --git a/frontend/src/components/tools/ocr/OCRSettings.tsx b/frontend/src/components/tools/ocr/OCRSettings.tsx
index 588884889..b4d9aa766 100644
--- a/frontend/src/components/tools/ocr/OCRSettings.tsx
+++ b/frontend/src/components/tools/ocr/OCRSettings.tsx
@@ -2,13 +2,7 @@ import React from 'react';
 import { Stack, Select, Text, Divider } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import LanguagePicker from './LanguagePicker';
-
-export interface OCRParameters {
-  languages: string[];
-  ocrType: string;
-  ocrRenderType: string;
-  additionalOptions: string[];
-}
+import { OCRParameters } from '../../../hooks/tools/ocr/useOCRParameters';
 
 interface OCRSettingsProps {
   parameters: OCRParameters;
@@ -25,7 +19,7 @@ const OCRSettings: React.FC<OCRSettingsProps> = ({
 
   return (
     <Stack gap="md">
-      
+
       <Select
         label={t('ocr.settings.ocrMode.label', 'OCR Mode')}
         value={parameters.ocrType}
@@ -51,4 +45,4 @@ const OCRSettings: React.FC<OCRSettingsProps> = ({
   );
 };
 
-export default OCRSettings; 
\ No newline at end of file
+export default OCRSettings;
diff --git a/frontend/src/constants/addWatermarkConstants.ts b/frontend/src/constants/addWatermarkConstants.ts
index 65d26e5ca..7ea1fe29c 100644
--- a/frontend/src/constants/addWatermarkConstants.ts
+++ b/frontend/src/constants/addWatermarkConstants.ts
@@ -1,5 +1,3 @@
-import { AddWatermarkParameters } from "../hooks/tools/addWatermark/useAddWatermarkParameters";
-
 export interface AlphabetOption {
   value: string;
   label: string;
@@ -13,16 +11,3 @@ export const alphabetOptions: AlphabetOption[] = [
   { value: "chinese", label: "简体中文" },
   { value: "thai", label: "ไทย" },
 ];
-
-export const defaultWatermarkParameters: AddWatermarkParameters = {
-  watermarkType: undefined,
-  watermarkText: '',
-  fontSize: 12,
-  rotation: 0,
-  opacity: 50,
-  widthSpacer: 50,
-  heightSpacer: 50,
-  alphabet: 'roman',
-  customColor: '#d3d3d3',
-  convertPDFToImage: false
-};
\ No newline at end of file
diff --git a/frontend/src/hooks/tools/addPassword/useAddPasswordParameters.ts b/frontend/src/hooks/tools/addPassword/useAddPasswordParameters.ts
index ad428ebd5..50fe74d56 100644
--- a/frontend/src/hooks/tools/addPassword/useAddPasswordParameters.ts
+++ b/frontend/src/hooks/tools/addPassword/useAddPasswordParameters.ts
@@ -1,7 +1,8 @@
-import { useState } from 'react';
 import { ChangePermissionsParameters, ChangePermissionsParametersHook, useChangePermissionsParameters } from '../changePermissions/useChangePermissionsParameters';
+import { BaseParameters } from '../../../types/parameters';
+import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
 
-export interface AddPasswordParameters {
+export interface AddPasswordParameters extends BaseParameters {
   password: string;
   ownerPassword: string;
   keyLength: number;
@@ -11,14 +12,9 @@ export interface AddPasswordFullParameters extends AddPasswordParameters {
   permissions: ChangePermissionsParameters;
 }
 
-export interface AddPasswordParametersHook {
+export interface AddPasswordParametersHook extends BaseParametersHook<AddPasswordParameters> {
   fullParameters: AddPasswordFullParameters;
-  parameters: AddPasswordParameters;
   permissions: ChangePermissionsParametersHook;
-  updateParameter: <K extends keyof AddPasswordParameters>(parameter: K, value: AddPasswordParameters[K]) => void;
-  resetParameters: () => void;
-  validateParameters: () => boolean;
-  getEndpointName: () => string;
 }
 
 export const defaultParameters: AddPasswordParameters = {
@@ -28,42 +24,31 @@ export const defaultParameters: AddPasswordParameters = {
 };
 
 export const useAddPasswordParameters = (): AddPasswordParametersHook => {
-  const [parameters, setParameters] = useState<AddPasswordParameters>(defaultParameters);
   const permissions = useChangePermissionsParameters();
+
+  const baseHook = useBaseParameters({
+    defaultParameters,
+    endpointName: 'add-password',
+    validateFn: () => {
+      // No required parameters for Add Password. Defer to permissions validation.
+      return permissions.validateParameters();
+    },
+  });
+
   const fullParameters: AddPasswordFullParameters = {
-    ...parameters,
+    ...baseHook.parameters,
     permissions: permissions.parameters,
   };
 
-  const updateParameter = <K extends keyof AddPasswordParameters>(parameter: K, value: AddPasswordParameters[K]) => {
-    setParameters(prev => ({
-       ...prev,
-       [parameter]: value,
-      })
-    );
-  };
-
   const resetParameters = () => {
-    setParameters(defaultParameters);
+    baseHook.resetParameters();
     permissions.resetParameters();
   };
 
-  const validateParameters = () => {
-    // No required parameters for Add Password. Defer to permissions validation.
-    return permissions.validateParameters();
-  };
-
-  const getEndpointName = () => {
-    return 'add-password';
-  };
-
   return {
+    ...baseHook,
     fullParameters,
-    parameters,
     permissions,
-    updateParameter,
     resetParameters,
-    validateParameters,
-    getEndpointName,
   };
 };
diff --git a/frontend/src/hooks/tools/addWatermark/useAddWatermarkParameters.ts b/frontend/src/hooks/tools/addWatermark/useAddWatermarkParameters.ts
index aa2f3bdda..a7cb23430 100644
--- a/frontend/src/hooks/tools/addWatermark/useAddWatermarkParameters.ts
+++ b/frontend/src/hooks/tools/addWatermark/useAddWatermarkParameters.ts
@@ -1,7 +1,7 @@
-import { useState, useCallback } from 'react';
-import { defaultWatermarkParameters } from '../../../constants/addWatermarkConstants';
+import { BaseParameters } from '../../../types/parameters';
+import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
 
-export interface AddWatermarkParameters {
+export interface AddWatermarkParameters extends BaseParameters {
   watermarkType?: 'text' | 'image';
   watermarkText: string;
   watermarkImage?: File;
@@ -15,36 +15,34 @@ export interface AddWatermarkParameters {
   convertPDFToImage: boolean;
 }
 
+export const defaultParameters: AddWatermarkParameters = {
+  watermarkType: undefined,
+  watermarkText: '',
+  fontSize: 12,
+  rotation: 0,
+  opacity: 50,
+  widthSpacer: 50,
+  heightSpacer: 50,
+  alphabet: 'roman',
+  customColor: '#d3d3d3',
+  convertPDFToImage: false
+};
 
-export const useAddWatermarkParameters = () => {
-  const [parameters, setParameters] = useState<AddWatermarkParameters>(defaultWatermarkParameters);
+export type AddWatermarkParametersHook = BaseParametersHook<AddWatermarkParameters>;
 
-  const updateParameter = useCallback(<K extends keyof AddWatermarkParameters>(
-    key: K,
-    value: AddWatermarkParameters[K]
-  ) => {
-    setParameters(prev => ({ ...prev, [key]: value }));
-  }, []);
-
-  const resetParameters = useCallback(() => {
-    setParameters(defaultWatermarkParameters);
-  }, []);
-
-  const validateParameters = useCallback((): boolean => {
-    if (!parameters.watermarkType) {
-      return false;
-    }
-    if (parameters.watermarkType === 'text') {
-      return parameters.watermarkText.trim().length > 0;
-    } else {
-      return parameters.watermarkImage !== undefined;
-    }
-  }, [parameters]);
-
-  return {
-    parameters,
-    updateParameter,
-    resetParameters,
-    validateParameters
-  };
-};
\ No newline at end of file
+export const useAddWatermarkParameters = (): AddWatermarkParametersHook => {
+  return useBaseParameters({
+    defaultParameters: defaultParameters,
+    endpointName: 'add-watermark',
+    validateFn: (params): boolean => {
+      if (!params.watermarkType) {
+        return false;
+      }
+      if (params.watermarkType === 'text') {
+        return params.watermarkText.trim().length > 0;
+      } else {
+        return params.watermarkImage !== undefined;
+      }
+    },
+  });
+};
diff --git a/frontend/src/hooks/tools/changePermissions/useChangePermissionsParameters.ts b/frontend/src/hooks/tools/changePermissions/useChangePermissionsParameters.ts
index 43d21f36f..7092798b7 100644
--- a/frontend/src/hooks/tools/changePermissions/useChangePermissionsParameters.ts
+++ b/frontend/src/hooks/tools/changePermissions/useChangePermissionsParameters.ts
@@ -1,6 +1,7 @@
-import { useState } from 'react';
+import { BaseParameters } from '../../../types/parameters';
+import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
 
-export interface ChangePermissionsParameters {
+export interface ChangePermissionsParameters extends BaseParameters {
   preventAssembly: boolean;
   preventExtractContent: boolean;
   preventExtractForAccessibility: boolean;
@@ -11,14 +12,6 @@ export interface ChangePermissionsParameters {
   preventPrintingFaithful: boolean;
 }
 
-export interface ChangePermissionsParametersHook {
-  parameters: ChangePermissionsParameters;
-  updateParameter: (parameter: keyof ChangePermissionsParameters, value: boolean) => void;
-  resetParameters: () => void;
-  validateParameters: () => boolean;
-  getEndpointName: () => string;
-}
-
 export const defaultParameters: ChangePermissionsParameters = {
   preventAssembly: false,
   preventExtractContent: false,
@@ -30,35 +23,11 @@ export const defaultParameters: ChangePermissionsParameters = {
   preventPrintingFaithful: false,
 };
 
+export type ChangePermissionsParametersHook = BaseParametersHook<ChangePermissionsParameters>;
+
 export const useChangePermissionsParameters = (): ChangePermissionsParametersHook => {
-  const [parameters, setParameters] = useState<ChangePermissionsParameters>(defaultParameters);
-
-  const updateParameter = <K extends keyof ChangePermissionsParameters>(parameter: K, value: ChangePermissionsParameters[K]) => {
-    setParameters(prev => ({
-       ...prev,
-       [parameter]: value,
-      })
-    );
-  };
-
-  const resetParameters = () => {
-    setParameters(defaultParameters);
-  };
-
-  const validateParameters = () => {
-    // Always valid - any combination of permissions is allowed
-    return true;
-  };
-
-  const getEndpointName = () => {
-    return 'add-password'; // Change Permissions is a fake endpoint for the Add Password tool
-  };
-
-  return {
-    parameters,
-    updateParameter,
-    resetParameters,
-    validateParameters,
-    getEndpointName,
-  };
+  return useBaseParameters({
+    defaultParameters,
+    endpointName: 'add-password', // Change Permissions is a fake endpoint for the Add Password tool
+  });
 };
diff --git a/frontend/src/hooks/tools/compress/useCompressOperation.ts b/frontend/src/hooks/tools/compress/useCompressOperation.ts
index ebcac8b66..c93d4b9e7 100644
--- a/frontend/src/hooks/tools/compress/useCompressOperation.ts
+++ b/frontend/src/hooks/tools/compress/useCompressOperation.ts
@@ -1,15 +1,7 @@
 import { useTranslation } from 'react-i18next';
-import { useToolOperation, ToolOperationConfig } from '../shared/useToolOperation';
+import { useToolOperation } from '../shared/useToolOperation';
 import { createStandardErrorHandler } from '../../../utils/toolErrorHandler';
-
-export interface CompressParameters {
-  compressionLevel: number;
-  grayscale: boolean;
-  expectedSize: string;
-  compressionMethod: 'quality' | 'filesize';
-  fileSizeValue: string;
-  fileSizeUnit: 'KB' | 'MB';
-}
+import { CompressParameters } from './useCompressParameters';
 
 const buildFormData = (parameters: CompressParameters, file: File): FormData => {
   const formData = new FormData();
diff --git a/frontend/src/hooks/tools/compress/useCompressParameters.ts b/frontend/src/hooks/tools/compress/useCompressParameters.ts
index bbd1a0994..b423bdbec 100644
--- a/frontend/src/hooks/tools/compress/useCompressParameters.ts
+++ b/frontend/src/hooks/tools/compress/useCompressParameters.ts
@@ -1,15 +1,16 @@
-import { useState } from 'react';
-import { CompressParameters } from './useCompressOperation';
+import { BaseParameters } from '../../../types/parameters';
+import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
 
-export interface CompressParametersHook {
-  parameters: CompressParameters;
-  updateParameter: (parameter: keyof CompressParameters, value: string | boolean | number) => void;
-  resetParameters: () => void;
-  validateParameters: () => boolean;
-  getEndpointName: () => string;
+export interface CompressParameters extends BaseParameters {
+  compressionLevel: number;
+  grayscale: boolean;
+  expectedSize: string;
+  compressionMethod: 'quality' | 'filesize';
+  fileSizeValue: string;
+  fileSizeUnit: 'KB' | 'MB';
 }
 
-const initialParameters: CompressParameters = {
+const defaultParameters: CompressParameters = {
   compressionLevel: 5,
   grayscale: false,
   expectedSize: '',
@@ -18,32 +19,15 @@ const initialParameters: CompressParameters = {
   fileSizeUnit: 'MB',
 };
 
+export type CompressParametersHook = BaseParametersHook<CompressParameters>;
+
 export const useCompressParameters = (): CompressParametersHook => {
-  const [parameters, setParameters] = useState<CompressParameters>(initialParameters);
-
-  const updateParameter = (parameter: keyof CompressParameters, value: string | boolean | number) => {
-    setParameters(prev => ({ ...prev, [parameter]: value }));
-  };
-
-  const resetParameters = () => {
-    setParameters(initialParameters);
-  };
-
-  const validateParameters = () => {
-    // For compression, we only need to validate that compression level is within range
-    // and that at least one file is selected (at least, I think that's all we need to do here)
-    return parameters.compressionLevel >= 1 && parameters.compressionLevel <= 9;
-  };
-
-  const getEndpointName = () => {
-    return 'compress-pdf';
-  };
-
-  return {
-    parameters,
-    updateParameter,
-    resetParameters,
-    validateParameters,
-    getEndpointName,
-  };
-};
\ No newline at end of file
+  return useBaseParameters({
+    defaultParameters,
+    endpointName: 'compress-pdf',
+    validateFn: (params) => {
+      // For compression, we only need to validate that compression level is within range
+      return params.compressionLevel >= 1 && params.compressionLevel <= 9;
+    },
+  });
+};
diff --git a/frontend/src/hooks/tools/convert/useConvertParameters.test.ts b/frontend/src/hooks/tools/convert/useConvertParameters.test.ts
index b106c18cd..1c809c190 100644
--- a/frontend/src/hooks/tools/convert/useConvertParameters.test.ts
+++ b/frontend/src/hooks/tools/convert/useConvertParameters.test.ts
@@ -5,14 +5,15 @@
 import { describe, test, expect } from 'vitest';
 import { renderHook, act } from '@testing-library/react';
 import { useConvertParameters } from './useConvertParameters';
+import { FIT_OPTIONS } from '../../../constants/convertConstants';
 
 describe('useConvertParameters', () => {
-  
+
   describe('Parameter Management', () => {
-    
+
     test('should initialize with default parameters', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       expect(result.current.parameters.fromExtension).toBe('');
       expect(result.current.parameters.toExtension).toBe('');
       expect(result.current.parameters.imageOptions.colorType).toBe('color');
@@ -28,46 +29,52 @@ describe('useConvertParameters', () => {
 
     test('should update individual parameters', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       act(() => {
         result.current.updateParameter('fromExtension', 'pdf');
       });
-      
+
       expect(result.current.parameters.fromExtension).toBe('pdf');
       expect(result.current.parameters.toExtension).toBe(''); // Should not affect other params
     });
 
     test('should update nested image options', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       act(() => {
         result.current.updateParameter('imageOptions', {
           colorType: 'grayscale',
           dpi: 150,
-          singleOrMultiple: 'single'
+          singleOrMultiple: 'single',
+          fitOption: FIT_OPTIONS.FILL_PAGE,
+          autoRotate: false,
+          combineImages: false,
         });
       });
-      
+
       expect(result.current.parameters.imageOptions.colorType).toBe('grayscale');
       expect(result.current.parameters.imageOptions.dpi).toBe(150);
       expect(result.current.parameters.imageOptions.singleOrMultiple).toBe('single');
+      expect(result.current.parameters.imageOptions.fitOption).toBe(FIT_OPTIONS.FILL_PAGE);
+      expect(result.current.parameters.imageOptions.autoRotate).toBe(false);
+      expect(result.current.parameters.imageOptions.combineImages).toBe(false);
     });
 
     test('should update nested HTML options', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       act(() => {
         result.current.updateParameter('htmlOptions', {
           zoomLevel: 1.5
         });
       });
-      
+
       expect(result.current.parameters.htmlOptions.zoomLevel).toBe(1.5);
     });
 
     test('should update nested email options', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       act(() => {
         result.current.updateParameter('emailOptions', {
           includeAttachments: false,
@@ -76,7 +83,7 @@ describe('useConvertParameters', () => {
           includeAllRecipients: true
         });
       });
-      
+
       expect(result.current.parameters.emailOptions.includeAttachments).toBe(false);
       expect(result.current.parameters.emailOptions.maxAttachmentSizeMB).toBe(20);
       expect(result.current.parameters.emailOptions.downloadHtml).toBe(true);
@@ -85,49 +92,49 @@ describe('useConvertParameters', () => {
 
     test('should update nested PDF/A options', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       act(() => {
         result.current.updateParameter('pdfaOptions', {
           outputFormat: 'pdfa'
         });
       });
-      
+
       expect(result.current.parameters.pdfaOptions.outputFormat).toBe('pdfa');
     });
 
     test('should reset parameters to defaults', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       act(() => {
         result.current.updateParameter('fromExtension', 'pdf');
         result.current.updateParameter('toExtension', 'png');
       });
-      
+
       expect(result.current.parameters.fromExtension).toBe('pdf');
-      
+
       act(() => {
         result.current.resetParameters();
       });
-      
+
       expect(result.current.parameters.fromExtension).toBe('');
       expect(result.current.parameters.toExtension).toBe('');
     });
   });
 
   describe('Parameter Validation', () => {
-    
+
     test('should validate parameters correctly', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       // No parameters - should be invalid
       expect(result.current.validateParameters()).toBe(false);
-      
+
       // Only fromExtension - should be invalid
       act(() => {
         result.current.updateParameter('fromExtension', 'pdf');
       });
       expect(result.current.validateParameters()).toBe(false);
-      
+
       // Both extensions with supported conversion - should be valid
       act(() => {
         result.current.updateParameter('toExtension', 'png');
@@ -137,63 +144,63 @@ describe('useConvertParameters', () => {
 
     test('should validate unsupported conversions', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       act(() => {
         result.current.updateParameter('fromExtension', 'pdf');
         result.current.updateParameter('toExtension', 'unsupported');
       });
-      
+
       expect(result.current.validateParameters()).toBe(false);
     });
 
   });
 
   describe('Endpoint Generation', () => {
-    
+
     test('should generate correct endpoint names', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       act(() => {
         result.current.updateParameter('fromExtension', 'pdf');
         result.current.updateParameter('toExtension', 'png');
       });
-      
+
       const endpointName = result.current.getEndpointName();
       expect(endpointName).toBe('pdf-to-img');
     });
 
     test('should generate correct endpoint URLs', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       act(() => {
         result.current.updateParameter('fromExtension', 'pdf');
         result.current.updateParameter('toExtension', 'png');
       });
-      
+
       const endpoint = result.current.getEndpoint();
       expect(endpoint).toBe('/api/v1/convert/pdf/img');
     });
 
     test('should return empty strings for invalid conversions', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       act(() => {
         result.current.updateParameter('fromExtension', 'invalid');
         result.current.updateParameter('toExtension', 'invalid');
       });
-      
+
       expect(result.current.getEndpointName()).toBe('');
       expect(result.current.getEndpoint()).toBe('');
     });
   });
 
   describe('Available Extensions', () => {
-    
+
     test('should return available extensions for valid source format', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       const availableExtensions = result.current.getAvailableToExtensions('pdf');
-      
+
       expect(availableExtensions.length).toBeGreaterThan(0);
       expect(availableExtensions.some(ext => ext.value === 'png')).toBe(true);
       expect(availableExtensions.some(ext => ext.value === 'jpg')).toBe(true);
@@ -201,9 +208,9 @@ describe('useConvertParameters', () => {
 
     test('should return empty array for invalid source format', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       const availableExtensions = result.current.getAvailableToExtensions('invalid');
-      
+
       expect(availableExtensions).toEqual([{
         "group": "Document",
         "label": "PDF",
@@ -213,11 +220,11 @@ describe('useConvertParameters', () => {
 
     test('should return empty array for empty source format', () => {
       const { result } = renderHook(() => useConvertParameters());
-      
+
       const availableExtensions = result.current.getAvailableToExtensions('');
-      
+
       expect(availableExtensions).toEqual([]);
     });
   });
 
-});
\ No newline at end of file
+});
diff --git a/frontend/src/hooks/tools/convert/useConvertParameters.ts b/frontend/src/hooks/tools/convert/useConvertParameters.ts
index 9843ef44f..64ba7a38e 100644
--- a/frontend/src/hooks/tools/convert/useConvertParameters.ts
+++ b/frontend/src/hooks/tools/convert/useConvertParameters.ts
@@ -1,6 +1,5 @@
-import { useState, useEffect } from 'react';
-import { 
-  COLOR_TYPES, 
+import {
+  COLOR_TYPES,
   OUTPUT_OPTIONS,
   FIT_OPTIONS,
   TO_FORMAT_OPTIONS,
@@ -11,8 +10,10 @@ import {
 } from '../../../constants/convertConstants';
 import { getEndpointName as getEndpointNameUtil, getEndpointUrl, isImageFormat, isWebFormat } from '../../../utils/convertUtils';
 import { detectFileExtension as detectFileExtensionUtil } from '../../../utils/fileUtils';
+import { BaseParameters } from '../../../types/parameters';
+import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
 
-export interface ConvertParameters {
+export interface ConvertParameters extends BaseParameters {
   fromExtension: string;
   toExtension: string;
   imageOptions: {
@@ -39,18 +40,13 @@ export interface ConvertParameters {
   smartDetectionType: 'mixed' | 'images' | 'web' | 'none';
 }
 
-export interface ConvertParametersHook {
-  parameters: ConvertParameters;
-  updateParameter: (parameter: keyof ConvertParameters, value: any) => void;
-  resetParameters: () => void;
-  validateParameters: () => boolean;
-  getEndpointName: () => string;
+export interface ConvertParametersHook extends BaseParametersHook<ConvertParameters> {
   getEndpoint: () => string;
   getAvailableToExtensions: (fromExtension: string) => Array<{value: string, label: string, group: string}>;
   analyzeFileTypes: (files: Array<{name: string}>) => void;
 }
 
-const initialParameters: ConvertParameters = {
+const defaultParameters: ConvertParameters = {
   fromExtension: '',
   toExtension: '',
   imageOptions: {
@@ -77,67 +73,63 @@ const initialParameters: ConvertParameters = {
   smartDetectionType: 'none',
 };
 
-export const useConvertParameters = (): ConvertParametersHook => {
-  const [parameters, setParameters] = useState<ConvertParameters>(initialParameters);
+const validateParameters = (params: ConvertParameters): boolean => {
+  const { fromExtension, toExtension } = params;
 
-  const updateParameter = (parameter: keyof ConvertParameters, value: any) => {
-    setParameters(prev => ({ ...prev, [parameter]: value }));
-  };
+  if (!fromExtension || !toExtension) return false;
 
-  const resetParameters = () => {
-    setParameters(initialParameters);
-  };
+  // Handle dynamic format identifiers (file-<extension>)
+  let supportedToExtensions: string[] = [];
+  if (fromExtension.startsWith('file-')) {
+    // Dynamic format - use 'any' conversion options
+    supportedToExtensions = CONVERSION_MATRIX['any'] || [];
+  } else {
+    // Regular format - check conversion matrix
+    supportedToExtensions = CONVERSION_MATRIX[fromExtension] || [];
+  }
 
-  const validateParameters = () => {
-    const { fromExtension, toExtension } = parameters;
-    
-    if (!fromExtension || !toExtension) return false;
-    
-    // Handle dynamic format identifiers (file-<extension>)
-    let supportedToExtensions: string[] = [];
-    if (fromExtension.startsWith('file-')) {
-      // Dynamic format - use 'any' conversion options
-      supportedToExtensions = CONVERSION_MATRIX['any'] || [];
-    } else {
-      // Regular format - check conversion matrix
-      supportedToExtensions = CONVERSION_MATRIX[fromExtension] || [];
-    }
-    
-    if (!supportedToExtensions.includes(toExtension)) {
-      return false;
-    }
-    
-    return true;
-  };
+  if (!supportedToExtensions.includes(toExtension)) {
+    return false;
+  }
 
-  const getEndpointName = () => {
-    const { fromExtension, toExtension, isSmartDetection, smartDetectionType } = parameters;
-    
-    if (isSmartDetection) {
-      if (smartDetectionType === 'mixed') {
-        // Mixed file types -> PDF using file-to-pdf endpoint
-        return 'file-to-pdf';
-      } else if (smartDetectionType === 'images') {
-        // All images -> PDF using img-to-pdf endpoint
-        return 'img-to-pdf';
-      } else if (smartDetectionType === 'web') {
-        // All web files -> PDF using html-to-pdf endpoint
-        return 'html-to-pdf';
-      }
-    }
-    
-    // Handle dynamic format identifiers (file-<extension>)
-    if (fromExtension.startsWith('file-')) {
-      // Dynamic format - use file-to-pdf endpoint
+  return true;
+};
+
+const getEndpointName = (params: ConvertParameters): string => {
+  const { fromExtension, toExtension, isSmartDetection, smartDetectionType } = params;
+
+  if (isSmartDetection) {
+    if (smartDetectionType === 'mixed') {
+      // Mixed file types -> PDF using file-to-pdf endpoint
       return 'file-to-pdf';
+    } else if (smartDetectionType === 'images') {
+      // All images -> PDF using img-to-pdf endpoint
+      return 'img-to-pdf';
+    } else if (smartDetectionType === 'web') {
+      // All web files -> PDF using html-to-pdf endpoint
+      return 'html-to-pdf';
     }
-    
-    return getEndpointNameUtil(fromExtension, toExtension);
-  };
+  }
+
+  // Handle dynamic format identifiers (file-<extension>)
+  if (fromExtension.startsWith('file-')) {
+    // Dynamic format - use file-to-pdf endpoint
+    return 'file-to-pdf';
+  }
+
+  return getEndpointNameUtil(fromExtension, toExtension);
+};
+
+export const useConvertParameters = (): ConvertParametersHook => {
+  const baseHook = useBaseParameters({
+    defaultParameters,
+    endpointName: getEndpointName,
+    validateFn: validateParameters,
+  });
 
   const getEndpoint = () => {
-    const { fromExtension, toExtension, isSmartDetection, smartDetectionType } = parameters;
-    
+    const { fromExtension, toExtension, isSmartDetection, smartDetectionType } = baseHook.parameters;
+
     if (isSmartDetection) {
       if (smartDetectionType === 'mixed') {
         // Mixed file types -> PDF using file-to-pdf endpoint
@@ -150,37 +142,37 @@ export const useConvertParameters = (): ConvertParametersHook => {
         return '/api/v1/convert/html/pdf';
       }
     }
-    
+
     // Handle dynamic format identifiers (file-<extension>)
     if (fromExtension.startsWith('file-')) {
       // Dynamic format - use file-to-pdf endpoint
       return '/api/v1/convert/file/pdf';
     }
-    
+
     return getEndpointUrl(fromExtension, toExtension);
   };
 
   const getAvailableToExtensions = (fromExtension: string) => {
     if (!fromExtension) return [];
-    
+
     // Handle dynamic format identifiers (file-<extension>)
     if (fromExtension.startsWith('file-')) {
       // Dynamic format - use 'any' conversion options (file-to-pdf)
       const supportedExtensions = CONVERSION_MATRIX['any'] || [];
-      return TO_FORMAT_OPTIONS.filter(option => 
+      return TO_FORMAT_OPTIONS.filter(option =>
         supportedExtensions.includes(option.value)
       );
     }
-    
+
     let supportedExtensions = CONVERSION_MATRIX[fromExtension] || [];
-    
-    // If no explicit conversion exists, but file-to-pdf might be available, 
+
+    // If no explicit conversion exists, but file-to-pdf might be available,
     // fall back to 'any' conversion (which converts unknown files to PDF via file-to-pdf)
     if (supportedExtensions.length === 0 && fromExtension !== 'any') {
       supportedExtensions = CONVERSION_MATRIX['any'] || [];
     }
-    
-    return TO_FORMAT_OPTIONS.filter(option => 
+
+    return TO_FORMAT_OPTIONS.filter(option =>
       supportedExtensions.includes(option.value)
     );
   };
@@ -189,7 +181,7 @@ export const useConvertParameters = (): ConvertParametersHook => {
   const analyzeFileTypes = (files: Array<{name: string}>) => {
     if (files.length === 0) {
       // No files - only reset smart detection, keep user's format choices
-      setParameters(prev => ({
+      baseHook.setParameters(prev => ({
         ...prev,
         isSmartDetection: false,
         smartDetectionType: 'none'
@@ -197,13 +189,13 @@ export const useConvertParameters = (): ConvertParametersHook => {
       }));
       return;
     }
-    
+
     if (files.length === 1) {
       // Single file - use regular detection with smart target selection
       const detectedExt = detectFileExtensionUtil(files[0].name);
       let fromExt = detectedExt;
       let availableTargets = detectedExt ? CONVERSION_MATRIX[detectedExt] || [] : [];
-      
+
       // If no explicit conversion exists for this file type, create a dynamic format entry
       // and fall back to 'any' conversion logic for the actual endpoint
       if (availableTargets.length === 0 && detectedExt) {
@@ -214,21 +206,21 @@ export const useConvertParameters = (): ConvertParametersHook => {
         fromExt = 'any';
         availableTargets = CONVERSION_MATRIX['any'] || [];
       }
-      
-      setParameters(prev => {
+
+      baseHook.setParameters(prev => {
         // Check if current toExtension is still valid for the new fromExtension
         const currentToExt = prev.toExtension;
         const isCurrentToExtValid = availableTargets.includes(currentToExt);
-        
+
         // Auto-select target only if:
         // 1. No current target is set, OR
-        // 2. Current target is invalid for new source type, OR  
+        // 2. Current target is invalid for new source type, OR
         // 3. There's only one possible target (forced conversion)
         let newToExtension = currentToExt;
         if (!currentToExt || !isCurrentToExtValid) {
           newToExtension = availableTargets.length === 1 ? availableTargets[0] : '';
         }
-        
+
         return {
           ...prev,
           isSmartDetection: false,
@@ -249,27 +241,27 @@ export const useConvertParameters = (): ConvertParametersHook => {
       const detectedExt = uniqueExtensions[0];
       let fromExt = detectedExt;
       let availableTargets = CONVERSION_MATRIX[detectedExt] || [];
-      
+
       // If no explicit conversion exists for this file type, fall back to 'any'
       if (availableTargets.length === 0) {
         fromExt = 'any';
         availableTargets = CONVERSION_MATRIX['any'] || [];
       }
-      
-      setParameters(prev => {
+
+      baseHook.setParameters(prev => {
         // Check if current toExtension is still valid for the new fromExtension
         const currentToExt = prev.toExtension;
         const isCurrentToExtValid = availableTargets.includes(currentToExt);
-        
+
         // Auto-select target only if:
         // 1. No current target is set, OR
-        // 2. Current target is invalid for new source type, OR  
+        // 2. Current target is invalid for new source type, OR
         // 3. There's only one possible target (forced conversion)
         let newToExtension = currentToExt;
         if (!currentToExt || !isCurrentToExtValid) {
           newToExtension = availableTargets.length === 1 ? availableTargets[0] : '';
         }
-        
+
         return {
           ...prev,
           isSmartDetection: false,
@@ -282,10 +274,10 @@ export const useConvertParameters = (): ConvertParametersHook => {
       // Mixed file types
       const allImages = uniqueExtensions.every(ext => isImageFormat(ext));
       const allWeb = uniqueExtensions.every(ext => isWebFormat(ext));
-      
+
       if (allImages) {
         // All files are images - use image-to-pdf conversion
-        setParameters(prev => ({
+        baseHook.setParameters(prev => ({
           ...prev,
           isSmartDetection: true,
           smartDetectionType: 'images',
@@ -294,7 +286,7 @@ export const useConvertParameters = (): ConvertParametersHook => {
         }));
       } else if (allWeb) {
         // All files are web files - use html-to-pdf conversion
-        setParameters(prev => ({
+        baseHook.setParameters(prev => ({
           ...prev,
           isSmartDetection: true,
           smartDetectionType: 'web',
@@ -302,8 +294,8 @@ export const useConvertParameters = (): ConvertParametersHook => {
           toExtension: 'pdf'
         }));
       } else {
-        // Mixed non-image types - use file-to-pdf conversion  
-        setParameters(prev => ({
+        // Mixed non-image types - use file-to-pdf conversion
+        baseHook.setParameters(prev => ({
           ...prev,
           isSmartDetection: true,
           smartDetectionType: 'mixed',
@@ -315,13 +307,9 @@ export const useConvertParameters = (): ConvertParametersHook => {
   };
 
   return {
-    parameters,
-    updateParameter,
-    resetParameters,
-    validateParameters,
-    getEndpointName,
+    ...baseHook,
     getEndpoint,
     getAvailableToExtensions,
     analyzeFileTypes,
   };
-};
\ No newline at end of file
+};
diff --git a/frontend/src/hooks/tools/ocr/useOCROperation.ts b/frontend/src/hooks/tools/ocr/useOCROperation.ts
index 419a46f60..8beeff950 100644
--- a/frontend/src/hooks/tools/ocr/useOCROperation.ts
+++ b/frontend/src/hooks/tools/ocr/useOCROperation.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { OCRParameters } from '../../../components/tools/ocr/OCRSettings';
+import { OCRParameters } from './useOCRParameters';
 import { useToolOperation, ToolOperationConfig } from '../shared/useToolOperation';
 import { createStandardErrorHandler } from '../../../utils/toolErrorHandler';
 import { useToolResources } from '../shared/useToolResources';
diff --git a/frontend/src/hooks/tools/ocr/useOCRParameters.ts b/frontend/src/hooks/tools/ocr/useOCRParameters.ts
index 23702cdce..0fbda4a33 100644
--- a/frontend/src/hooks/tools/ocr/useOCRParameters.ts
+++ b/frontend/src/hooks/tools/ocr/useOCRParameters.ts
@@ -1,13 +1,15 @@
-import { useState } from 'react';
-import { OCRParameters } from '../../../components/tools/ocr/OCRSettings';
+import { BaseParameters } from '../../../types/parameters';
+import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
 
-export interface OCRParametersHook {
-  parameters: OCRParameters;
-  updateParameter: (key: keyof OCRParameters, value: any) => void;
-  resetParameters: () => void;
-  validateParameters: () => boolean;
+export interface OCRParameters extends BaseParameters {
+  languages: string[];
+  ocrType: string;
+  ocrRenderType: string;
+  additionalOptions: string[];
 }
 
+export type OCRParametersHook = BaseParametersHook<OCRParameters>;
+
 const defaultParameters: OCRParameters = {
   languages: [],
   ocrType: 'skip-text',
@@ -16,28 +18,12 @@ const defaultParameters: OCRParameters = {
 };
 
 export const useOCRParameters = (): OCRParametersHook => {
-  const [parameters, setParameters] = useState<OCRParameters>(defaultParameters);
-
-  const updateParameter = (key: keyof OCRParameters, value: any) => {
-    setParameters(prev => ({
-      ...prev,
-      [key]: value
-    }));
-  };
-
-  const resetParameters = () => {
-    setParameters(defaultParameters);
-  };
-
-  const validateParameters = () => {
-    // At minimum, we need at least one language selected
-    return parameters.languages.length > 0;
-  };
-
-  return {
-    parameters,
-    updateParameter,
-    resetParameters,
-    validateParameters,
-  };
-}; 
\ No newline at end of file
+  return useBaseParameters({
+    defaultParameters,
+    endpointName: 'ocr-pdf',
+    validateFn: (params) => {
+      // At minimum, we need at least one language selected
+      return params.languages.length > 0;
+    },
+  });
+};
diff --git a/frontend/src/hooks/tools/removePassword/useRemovePasswordParameters.ts b/frontend/src/hooks/tools/removePassword/useRemovePasswordParameters.ts
index df6b117f2..fc39db546 100644
--- a/frontend/src/hooks/tools/removePassword/useRemovePasswordParameters.ts
+++ b/frontend/src/hooks/tools/removePassword/useRemovePasswordParameters.ts
@@ -1,49 +1,22 @@
-import { useState } from 'react';
+import { BaseParameters } from '../../../types/parameters';
+import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
 
-export interface RemovePasswordParameters {
+export interface RemovePasswordParameters extends BaseParameters {
   password: string;
 }
 
-export interface RemovePasswordParametersHook {
-  parameters: RemovePasswordParameters;
-  updateParameter: <K extends keyof RemovePasswordParameters>(parameter: K, value: RemovePasswordParameters[K]) => void;
-  resetParameters: () => void;
-  validateParameters: () => boolean;
-  getEndpointName: () => string;
-}
+export type RemovePasswordParametersHook = BaseParametersHook<RemovePasswordParameters>;
 
 export const defaultParameters: RemovePasswordParameters = {
   password: '',
 };
 
 export const useRemovePasswordParameters = (): RemovePasswordParametersHook => {
-  const [parameters, setParameters] = useState<RemovePasswordParameters>(defaultParameters);
-
-  const updateParameter = <K extends keyof RemovePasswordParameters>(parameter: K, value: RemovePasswordParameters[K]) => {
-    setParameters(prev => ({
-       ...prev,
-       [parameter]: value,
-      })
-    );
-  };
-
-  const resetParameters = () => {
-    setParameters(defaultParameters);
-  };
-
-  const validateParameters = () => {
-    return parameters.password !== '';
-  };
-
-  const getEndpointName = () => {
-    return 'remove-password';
-  };
-
-  return {
-    parameters,
-    updateParameter,
-    resetParameters,
-    validateParameters,
-    getEndpointName,
-  };
+  return useBaseParameters({
+    defaultParameters,
+    endpointName: 'remove-password',
+    validateFn: (params) => {
+      return params.password !== '';
+    },
+  });
 };
diff --git a/frontend/src/hooks/tools/sanitize/useSanitizeParameters.ts b/frontend/src/hooks/tools/sanitize/useSanitizeParameters.ts
index ea3068c2d..9e050a7e5 100644
--- a/frontend/src/hooks/tools/sanitize/useSanitizeParameters.ts
+++ b/frontend/src/hooks/tools/sanitize/useSanitizeParameters.ts
@@ -1,6 +1,7 @@
-import { useState, useCallback } from 'react';
+import { BaseParameters } from '../../../types/parameters';
+import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
 
-export interface SanitizeParameters {
+export interface SanitizeParameters extends BaseParameters {
   removeJavaScript: boolean;
   removeEmbeddedFiles: boolean;
   removeXMPMetadata: boolean;
@@ -18,36 +19,14 @@ export const defaultParameters: SanitizeParameters = {
   removeFonts: false,
 };
 
-export const useSanitizeParameters = () => {
-  const [parameters, setParameters] = useState<SanitizeParameters>(defaultParameters);
+export type SanitizeParametersHook = BaseParametersHook<SanitizeParameters>;
 
-  const updateParameter = useCallback(<K extends keyof SanitizeParameters>(
-    key: K,
-    value: SanitizeParameters[K]
-  ) => {
-    setParameters(prev => ({
-      ...prev,
-      [key]: value
-    }));
-  }, []);
-
-  const resetParameters = useCallback(() => {
-    setParameters(defaultParameters);
-  }, []);
-
-  const validateParameters = useCallback(() => {
-    return Object.values(parameters).some(value => value === true);
-  }, [parameters]);
-
-  const getEndpointName = () => {
-    return 'sanitize-pdf'
-  };
-
-  return {
-    parameters,
-    updateParameter,
-    resetParameters,
-    validateParameters,
-    getEndpointName,
-  };
+export const useSanitizeParameters = (): SanitizeParametersHook => {
+  return useBaseParameters({
+    defaultParameters,
+    endpointName: 'sanitize-pdf',
+    validateFn: (params) => {
+      return Object.values(params).some(value => value === true);
+    },
+  });
 };
diff --git a/frontend/src/hooks/tools/shared/useBaseParameters.ts b/frontend/src/hooks/tools/shared/useBaseParameters.ts
index af244e6f9..941f8cdd2 100644
--- a/frontend/src/hooks/tools/shared/useBaseParameters.ts
+++ b/frontend/src/hooks/tools/shared/useBaseParameters.ts
@@ -1,7 +1,8 @@
-import { useState, useCallback } from 'react';
+import { useState, useCallback, Dispatch, SetStateAction } from 'react';
 
 export interface BaseParametersHook<T> {
   parameters: T;
+  setParameters: Dispatch<SetStateAction<T>>;
   updateParameter: <K extends keyof T>(parameter: K, value: T[K]) => void;
   resetParameters: () => void;
   validateParameters: () => boolean;
@@ -10,7 +11,7 @@ export interface BaseParametersHook<T> {
 
 export interface BaseParametersConfig<T> {
   defaultParameters: T;
-  endpointName: string;
+  endpointName: string | ((params: T) => string);
   validateFn?: (params: T) => boolean;
 }
 
@@ -32,15 +33,24 @@ export function useBaseParameters<T>(config: BaseParametersConfig<T>): BaseParam
     return config.validateFn ? config.validateFn(parameters) : true;
   }, [parameters, config.validateFn]);
 
-  const getEndpointName = useCallback(() => {
-    return config.endpointName;
-  }, [config.endpointName]);
+  const endpointName = config.endpointName;
+  let getEndpointName: () => string;
+  if (typeof endpointName === "string") {
+    getEndpointName = useCallback(() => {
+      return endpointName;
+    }, []);
+  } else {
+    getEndpointName = useCallback(() => {
+      return endpointName(parameters);
+    }, [parameters]);
+  }
 
   return {
     parameters,
+    setParameters,
     updateParameter,
     resetParameters,
     validateParameters,
     getEndpointName,
   };
-}
\ No newline at end of file
+}
diff --git a/frontend/src/hooks/tools/split/useSplitParameters.ts b/frontend/src/hooks/tools/split/useSplitParameters.ts
index dd3eb218f..b31ddbae6 100644
--- a/frontend/src/hooks/tools/split/useSplitParameters.ts
+++ b/frontend/src/hooks/tools/split/useSplitParameters.ts
@@ -1,7 +1,8 @@
-import { useState } from 'react';
 import { SPLIT_MODES, SPLIT_TYPES, ENDPOINTS, type SplitMode, SplitType } from '../../../constants/splitConstants';
+import { BaseParameters } from '../../../types/parameters';
+import { useBaseParameters, BaseParametersHook } from '../shared/useBaseParameters';
 
-export interface SplitParameters {
+export interface SplitParameters extends BaseParameters {
   mode: SplitMode | '';
   pages: string;
   hDiv: string;
@@ -14,15 +15,9 @@ export interface SplitParameters {
   allowDuplicates: boolean;
 }
 
-export interface SplitParametersHook {
-  parameters: SplitParameters;
-  updateParameter: (parameter: keyof SplitParameters, value: string | boolean) => void;
-  resetParameters: () => void;
-  validateParameters: () => boolean;
-  getEndpointName: () => string;
-}
+export type SplitParametersHook = BaseParametersHook<SplitParameters>;
 
-const initialParameters: SplitParameters = {
+const defaultParameters: SplitParameters = {
   mode: '',
   pages: '',
   hDiv: '2',
@@ -36,43 +31,27 @@ const initialParameters: SplitParameters = {
 };
 
 export const useSplitParameters = (): SplitParametersHook => {
-  const [parameters, setParameters] = useState<SplitParameters>(initialParameters);
+  return useBaseParameters({
+    defaultParameters,
+    endpointName: (params) => {
+      if (!params.mode) return ENDPOINTS[SPLIT_MODES.BY_PAGES];
+      return ENDPOINTS[params.mode as SplitMode];
+    },
+    validateFn: (params) => {
+      if (!params.mode) return false;
 
-  const updateParameter = (parameter: keyof SplitParameters, value: string | boolean) => {
-    setParameters(prev => ({ ...prev, [parameter]: value }));
-  };
-
-  const resetParameters = () => {
-    setParameters(initialParameters);
-  };
-
-  const validateParameters = () => {
-    if (!parameters.mode) return false;
-
-    switch (parameters.mode) {
-      case SPLIT_MODES.BY_PAGES:
-        return parameters.pages.trim() !== "";
-      case SPLIT_MODES.BY_SECTIONS:
-        return parameters.hDiv !== "" && parameters.vDiv !== "";
-      case SPLIT_MODES.BY_SIZE_OR_COUNT:
-        return parameters.splitValue.trim() !== "";
-      case SPLIT_MODES.BY_CHAPTERS:
-        return parameters.bookmarkLevel !== "";
-      default:
-        return false;
-    }
-  };
-
-  const getEndpointName = () => {
-    if (!parameters.mode) return ENDPOINTS[SPLIT_MODES.BY_PAGES];
-    return ENDPOINTS[parameters.mode as SplitMode];
-  };
-
-  return {
-    parameters,
-    updateParameter,
-    resetParameters,
-    validateParameters,
-    getEndpointName,
-  };
+      switch (params.mode) {
+        case SPLIT_MODES.BY_PAGES:
+          return params.pages.trim() !== "";
+        case SPLIT_MODES.BY_SECTIONS:
+          return params.hDiv !== "" && params.vDiv !== "";
+        case SPLIT_MODES.BY_SIZE_OR_COUNT:
+          return params.splitValue.trim() !== "";
+        case SPLIT_MODES.BY_CHAPTERS:
+          return params.bookmarkLevel !== "";
+        default:
+          return false;
+      }
+    },
+  });
 };
diff --git a/frontend/src/tests/convert/ConvertSmartDetectionIntegration.test.tsx b/frontend/src/tests/convert/ConvertSmartDetectionIntegration.test.tsx
index 764095ba8..4e9fb7908 100644
--- a/frontend/src/tests/convert/ConvertSmartDetectionIntegration.test.tsx
+++ b/frontend/src/tests/convert/ConvertSmartDetectionIntegration.test.tsx
@@ -13,6 +13,7 @@ import { I18nextProvider } from 'react-i18next';
 import i18n from '../../i18n/config';
 import axios from 'axios';
 import { detectFileExtension } from '../../utils/fileUtils';
+import { FIT_OPTIONS } from '../../constants/convertConstants';
 
 // Mock axios
 vi.mock('axios');
@@ -23,8 +24,8 @@ vi.mock('../../services/fileStorage', () => ({
   fileStorage: {
     init: vi.fn().mockResolvedValue(undefined),
     storeFile: vi.fn().mockImplementation((file, thumbnail) => {
-      return Promise.resolve({ 
-        id: `mock-id-${file.name}`, 
+      return Promise.resolve({
+        id: `mock-id-${file.name}`,
         name: file.name,
         size: file.size,
         type: file.type,
@@ -403,7 +404,7 @@ describe('Convert Tool - Smart Detection Integration Tests', () => {
           colorType: 'grayscale',
           dpi: 150,
           singleOrMultiple: 'single',
-          fitOption: 'fitToPage',
+          fitOption: FIT_OPTIONS.FIT_PAGE,
           autoRotate: false,
           combineImages: true
         });
@@ -417,7 +418,7 @@ describe('Convert Tool - Smart Detection Integration Tests', () => {
       });
 
       const formData = (mockedAxios.post as Mock).mock.calls[0][1] as FormData;
-      expect(formData.get('fitOption')).toBe('fitToPage');
+      expect(formData.get('fitOption')).toBe(FIT_OPTIONS.FIT_PAGE);
       expect(formData.get('colorType')).toBe('grayscale');
       expect(formData.get('autoRotate')).toBe('false');
     });