Better filename matching