Fixed two more problems with wildcarding in simplematch()