[FIX] Honor archived flag