Fixed filtering.