Added search for folders