Refactored archived and active filters