IOS-12 fix for limited folder depth

Allow for nest subfolders to be handled at unlimited depth.