Improved folder discover in Zipper::find_folder()