Fixed filtering with new curves.