[FIX] Added where clause for archived