Fixed filtering bug