Folder Selection optimized