[DataConfig] Updated filtering