Enhance validation of unmanged-files scope