Fixed filtering issue