Various performance improvment (for big thesaurus)