GCP-7001 fix for adding sub-folders issue, going to root of tree