Improved glob matching for files part 2