Fix missing NFD conversion in extended-search mode