Add trigram matching. Remove single char words.