introduced improved filename matching