Updated folder matching.