RAZ-3149 : Sub folders did not wrap properly