Small update to Retrieve Demo to support optional Folder parameter