Fixed filtering overrides