Improved do-locate-folder command