Expansion on folder-list functionality