Update folder selection logic to handle deep folders.

Update folder selection logic to handle deep folders. #4866