diff --git a/MARS_Packages/REL01_ADDITIONS/MARS-828/new_version/FILE_ARCHIVER.pkb b/MARS_Packages/REL01_ADDITIONS/MARS-828/new_version/FILE_ARCHIVER.pkb
index e9f83f7..2f977e5 100644
--- a/MARS_Packages/REL01_ADDITIONS/MARS-828/new_version/FILE_ARCHIVER.pkb
+++ b/MARS_Packages/REL01_ADDITIONS/MARS-828/new_version/FILE_ARCHIVER.pkb
@@ -132,7 +132,7 @@ AS
 
       if LENGTH(vArchivalTriggeredBy)>0 THEN 
          ENV_MANAGER.LOG_PROCESS_EVENT('Archival Triggered By: '||vArchivalTriggeredBy,'INFO');
-         vTableName := DBMS_ASSERT.SCHEMA_NAME(vSourceFileConfig.ODS_SCHEMA_NAME) || '.'||vSourceFileConfig.A_SOURCE_KEY||'_'||DBMS_ASSERT.simple_sql_name(vSourceFileConfig.TABLE_ID)||'_ODS';
+         vTableName := DBMS_ASSERT.SCHEMA_NAME(vSourceFileConfig.ODS_SCHEMA_NAME) || '.'||DBMS_ASSERT.simple_sql_name(vSourceFileConfig.TABLE_ID)||'_ODS';
          
          -- Use strategy-based WHERE clause (MARS-828)
          vQuery := '
@@ -387,14 +387,19 @@ AS
       vSourceFileConfig CT_MRDS.A_SOURCE_FILE_CONFIG%ROWTYPE;
       vTableName        VARCHAR2(200);
       vQuery            VARCHAR2(32000);
+      vWhereClause      VARCHAR2(4000);
    BEGIN
       vParameters := ENV_MANAGER.FORMAT_PARAMETERS(SYS.ODCIVARCHAR2LIST('pSourceFileConfigKey => '||nvl(to_char(pSourceFileConfigKey), 'NULL')));
       ENV_MANAGER.LOG_PROCESS_EVENT('Start','INFO', vParameters);
       vSourceFileConfig := FILE_MANAGER.GET_SOURCE_FILE_CONFIG(pSourceFileConfigKey => pSourceFileConfigKey);
 
-      vTableName := DBMS_ASSERT.SCHEMA_NAME(vSourceFileConfig.ODS_SCHEMA_NAME) || '.'||vSourceFileConfig.A_SOURCE_KEY||'_'||DBMS_ASSERT.simple_sql_name(vSourceFileConfig.TABLE_ID)||'_ODS';
+      vTableName := DBMS_ASSERT.SCHEMA_NAME(vSourceFileConfig.ODS_SCHEMA_NAME) || '.'||DBMS_ASSERT.simple_sql_name(vSourceFileConfig.TABLE_ID)||'_ODS';
       ENV_MANAGER.LOG_PROCESS_EVENT('vTableName','DEBUG',vTableName);
       
+      -- Get WHERE clause based on archival strategy (MARS-828)
+      vWhereClause := GET_ARCHIVAL_WHERE_CLAUSE(vSourceFileConfig);
+      ENV_MANAGER.LOG_PROCESS_EVENT('vWhereClause','DEBUG',vWhereClause);
+      
       -- Use strategy-based WHERE clause for statistics (MARS-828)
       vQuery := 
       'with tmp as (
@@ -419,12 +424,12 @@ AS
          ,'||pSourceFileConfigKey||'     as A_SOURCE_FILE_CONFIG_KEY
          ,'''||vTableName||''' as TABLE_NAME
          ,count(*) as FILE_COUNT
-         ,sum(case when ' || GET_ARCHIVAL_WHERE_CLAUSE(vSourceFileConfig) || ' then 1 else 0 end) as OLD_FILE_COUNT
+         ,sum(case when ' || vWhereClause || ' then 1 else 0 end) as OLD_FILE_COUNT
          ,sum (row_count_per_file) as ROW_COUNT
-         ,sum(case when ' || GET_ARCHIVAL_WHERE_CLAUSE(vSourceFileConfig) || ' then row_count_per_file else 0 end) as OLD_ROW_COUNT
+         ,sum(case when ' || vWhereClause || ' then row_count_per_file else 0 end) as OLD_ROW_COUNT
          ,sum(r.bytes) as BYTES
-         ,sum(case when ' || GET_ARCHIVAL_WHERE_CLAUSE(vSourceFileConfig) || ' then r.bytes else 0 end) as OLD_BYTES
-         ,'||vSourceFileConfig.DAYS_FOR_ARCHIVE_THRESHOLD||' as DAYS_FOR_ARCHIVE_THRESHOLD
+         ,sum(case when ' || vWhereClause || ' then r.bytes else 0 end) as OLD_BYTES
+         ,'||COALESCE(TO_CHAR(vSourceFileConfig.DAYS_FOR_ARCHIVE_THRESHOLD), 'NULL')||' as DAYS_FOR_ARCHIVE_THRESHOLD
          ,systimestamp as CREATED
       from tmp_gr t
       join (SELECT * from DBMS_CLOUD.LIST_OBJECTS(