fixed issues for searching without UnicodeNames file