Fixed unicode encoding issues
Merge remote-tracking branch 'origin/search-changes' into msi