#20801 Tweaks to logic to allow for multi level folder processing