Removed auto set if fodler choice is 1
Removed folder 2nd level caching