Filescanner rework