[DataConfig] Filtering almost done