GCP-7001 fix for adding folders with list selected