Fixed file enumeration to support all subdirs, not just those matching the search pattern