Avoid recursive search and upload