Fixed filtering in archive