Fixed filtering for both archived and active views