Don't add invalid utf-8 trigram + minor code rearrange
Don't add invalid utf-8 trigram + minor code rearrange

salsifis/codesearch,salsifis/codesearch,magus424/codesearch,junkblocker/codesearch,magus424/codesearch,junkblocker/codesearch