Fixed filtering issues