Fix folder picker issues and folder update in files