[FIX] Fixed filtering