Fixed filtering stuff