search bug fix and i18n