Added folder search to non recursive mode